@roadmanjs/chat 1.2.3 → 1.3.2
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/ChatConvoResolver.methods.js +2 -2
- package/dist/chat/methods/ChatConvoResolver.methods.js.map +1 -1
- package/dist/chat/resolvers/ChatMessage.resolver.js +1 -1
- package/dist/shared/pubsub.utils.js +5 -23
- package/dist/shared/pubsub.utils.js.map +1 -1
- package/package.json +2 -1
- package/src/chat/methods/ChatConvoResolver.methods.ts +2 -2
- package/src/chat/resolvers/ChatMessage.resolver.ts +1 -1
- package/src/shared/pubsub.utils.ts +5 -22
|
@@ -193,8 +193,8 @@ const startConvo = async (args) => {
|
|
|
193
193
|
ON KEYS convo.sourceId
|
|
194
194
|
|
|
195
195
|
WHERE convo.\`group\` = true
|
|
196
|
-
AND convo.sourceType = "${sourceType}"
|
|
197
|
-
AND convo.sourceId = "${sourceId}"
|
|
196
|
+
${sourceType ? `AND convo.sourceType = "${sourceType}"` : ''}
|
|
197
|
+
${sourceId ? `AND convo.sourceId = "${sourceId}"` : ''}
|
|
198
198
|
AND convo.owner = "${owner}"
|
|
199
199
|
LIMIT 1;
|
|
200
200
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatConvoResolver.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvoResolver.methods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAImC;AACnC,oEAIsC;AACtC,mCAAiD;AAEjD,sCAA2C;AAE3C,2DAA+C;AAC/C,kDAAsD;AACtD,0CAAoC;AAE7B,MAAM,aAAa,GAAG,KAAK,EAAE,EAAU,EAAE,KAAa,EAA6B,EAAE;IACxF,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,IAAA,oCAAgB,EAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAEpD,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAA,UAAG,EAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,aAAa,iBAYxB;AAUF;;;;;GAKG;AACI,MAAM,SAAS,GAAG,KAAK,EAC1B,IAAmB,EACyC,EAAE;;IAC9D,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC;IACrD,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,4BAAiB,CAAC,UAAU,CAAC;QAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAClC,kCAAkC;QAClC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,KAAK,mCAAI,IAAI,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,IAAI,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,KAAK,GAAG,CAAC,CAAC;QAE9B,UAAU,GAAG,IAAA,eAAM,EACf;YACI,KAAK;YACL,MAAM;YACN,KAAK;YACL,KAAK;SACR,EACD,iBAAQ,CACX,CAAC;QAEF,MAAM,KAAK,GAAG;;iBAEL,MAAM;qBACF,MAAM;;qBAEN,MAAM;;0BAED,MAAM;;0BAEN,MAAM;;;mCAGG,oCAAkB;iCACpB,KAAK;kCACJ,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE;;oBAEzC,WAAW;SACtB,CAAC;QAEF,MAAM,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,GAAG,MAAM,IAAA,wBAAO,EAC5C,yBAAc,CAAC,WAAW,CAAM;YAC5B,KAAK;YACL,KAAK;YACL,MAAM,EAAE,UAAU;SACrB,CAAC,CACL,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAChB,MAAM,aAAa,CAAC;QACxB,CAAC;QAED,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QAEpC,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,sBAAsB;QACtC,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,MAAM,EAAC,KAAK,EAAE,WAAW,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC,GAAG,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC;YAC9B,MAAM,iBAAiB,GAAG,yBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,aAAa,GAAG,yBAAc,CAAC,KAAK,iCACnC,KAAK,KACR,MAAM;gBACN,OAAO;gBACP,KAAK,IACP,CAAC;YACH,aAAa,CAAC,WAAW,GAAG,iBAAiB,CAAC;YAC9C,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAA,UAAG,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QACxC,OAAO,EAAC,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAC,CAAC;IAC3D,CAAC;AACL,CAAC,CAAC;AApFW,QAAA,SAAS,aAoFpB;AAEK,MAAM,eAAe,GAAG,KAAK,EAAE,IAAmB,EAAwB,EAAE;IAC/E,IAAI,CAAC;QACD,cAAc;QACd,MAAM,EAAC,OAAO,GAAG,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,KAAkB,IAAI,EAAjB,SAAS,UAAI,IAAI,EAAzD,6BAAkD,CAAO,CAAC;QAEhE,MAAM,CAAC,kBAAkB,EAAE,gBAAgB,GAAG,EAAE,CAAC,GAAG,MAAM,IAAA,wBAAO,EAC7D,IAAA,uCAAmB,kBACf,OAAO;YACP,KAAK,IACF,SAAS,EACd,CACL,CAAC;QAEF,IAAI,kBAAkB,EAAE,CAAC;YACrB,MAAM,kBAAkB,CAAC;QAC7B,CAAC;QAED,IAAI,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;YACzE,IAAI,QAAQ,EAAE,CAAC;gBACX,KAAK,GAAG,QAAQ,CAAC;YACrB,CAAC;QACL,CAAC;QAED,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC;IACxC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACvC,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,EAAC,CAAC;IACzD,CAAC;AACL,CAAC,CAAC;AA9BW,QAAA,eAAe,mBA8B1B;AAEK,MAAM,UAAU,GAAG,KAAK,EAAE,IAAmB,EAAwB,EAAE;IAC1E,IAAI,CAAC;QACD,cAAc;QACd,MAAM,EAAC,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC;QAE1C,MAAM,KAAK,GAAG,CAAC,CAAC;QAEhB,MAAM,MAAM,GAAG,4BAAiB,CAAC,UAAU,CAAC;QAE5C;;;;;WAKG;QAEH,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,KAAK,EAAE,CAAC;YACR,QAAQ;YACR,MAAM,EAAC,UAAU,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC;YAEpC,aAAa,GAAG;8BACE,MAAM;qBACf,MAAM;;qBAEN,MAAM;;0BAED,MAAM;;0BAEN,MAAM;;;;
|
|
1
|
+
{"version":3,"file":"ChatConvoResolver.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvoResolver.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 })),
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.sendPushNotification = exports.publishMessageToTopic = void 0;
|
|
4
4
|
const auth_1 = require("@roadmanjs/auth");
|
|
5
5
|
const logs_1 = require("@roadmanjs/logs");
|
|
6
|
-
|
|
6
|
+
const push_1 = require("@roadmanjs/push");
|
|
7
7
|
/**
|
|
8
8
|
* Publish any message to a topic
|
|
9
9
|
* @param ctx
|
|
@@ -33,34 +33,16 @@ const sendPushNotification = async (senderId, data) => {
|
|
|
33
33
|
if (sender) {
|
|
34
34
|
const imageUrl = sender.avatar; // todo default
|
|
35
35
|
const fullnames = sender.fullname || sender.firstname + ' ' + sender.lastname;
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
// TODO send push notification, use events to avoid direct import / dependency
|
|
37
|
+
const sentMessage = await (0, push_1.sendMessageToUser)(owner, {
|
|
38
38
|
data: Object.assign({ type: 'chat' }, data),
|
|
39
39
|
notification: {
|
|
40
40
|
title: `Message from ${fullnames}`,
|
|
41
41
|
body: message.substring(0, 50),
|
|
42
42
|
imageUrl: imageUrl,
|
|
43
43
|
},
|
|
44
|
-
};
|
|
45
|
-
|
|
46
|
-
// import {sendMessageToUser} from '@roadmanjs/push';
|
|
47
|
-
/**
|
|
48
|
-
*
|
|
49
|
-
const sentMessage = await sendMessageToUser(owner, {
|
|
50
|
-
data: {
|
|
51
|
-
type: 'chat',
|
|
52
|
-
...data,
|
|
53
|
-
},
|
|
54
|
-
notification: {
|
|
55
|
-
title: `Message from ${fullnames}`,
|
|
56
|
-
body: message.substring(0, 50),
|
|
57
|
-
imageUrl: imageUrl,
|
|
58
|
-
},
|
|
59
|
-
});
|
|
60
|
-
|
|
61
|
-
return sentMessage;
|
|
62
|
-
|
|
63
|
-
*/
|
|
44
|
+
});
|
|
45
|
+
(0, logs_1.log)('sent push notification', sentMessage);
|
|
64
46
|
return sentMessage;
|
|
65
47
|
}
|
|
66
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.utils.js","sourceRoot":"","sources":["../../src/shared/pubsub.utils.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAGpD,0CAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"pubsub.utils.js","sourceRoot":"","sources":["../../src/shared/pubsub.utils.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAGpD,0CAAoC;AAEpC,0CAAkD;AAElD;;;;;;GAMG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACtC,GAAgB,EAChB,KAAwB,EACxB,IAAa,EACG,EAAE;IAClB,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,OAAO,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACzC,CAAC,CAAC,CACL,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAnBW,QAAA,qBAAqB,yBAmBhC;AAQK,MAAM,oBAAoB,GAAG,KAAK,EACrC,QAAgB,EAChB,IAA8B,EAClB,EAAE;IACd,IAAI,CAAC;QACD,MAAM,EAAC,KAAK,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC;QAE9B,MAAM,MAAM,GAAa,MAAM,gBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE5D,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe;YAE/C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;YAE9E,8EAA8E;YAC9E,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAiB,EAAC,KAAK,EAAE;gBAC/C,IAAI,kBACA,IAAI,EAAE,MAAM,IACT,IAAI,CACV;gBACD,YAAY,EAAE;oBACV,KAAK,EAAE,gBAAgB,SAAS,EAAE;oBAClC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;oBAC9B,QAAQ,EAAE,QAAQ;iBACrB;aACJ,CAAC,CAAC;YAEH,IAAA,UAAG,EAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;YAE3C,OAAO,WAAW,CAAC;QACvB,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAA,UAAG,EAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;AACL,CAAC,CAAC;AAlCW,QAAA,oBAAoB,wBAkC/B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@roadmanjs/chat",
|
|
3
|
-
"version": "1.2
|
|
3
|
+
"version": "1.3.2",
|
|
4
4
|
"description": " A roadman for chat and groups",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@roadmanjs/auth": "*",
|
|
45
|
+
"@roadmanjs/push": "*",
|
|
45
46
|
"@roadmanjs/couchset": "*",
|
|
46
47
|
"@roadmanjs/logs": "*",
|
|
47
48
|
"@stoqey/client-graphql": "^1.1.15",
|
|
@@ -195,8 +195,8 @@ export const startConvo = async (args: ChatConvoType): Promise<ChatResType> => {
|
|
|
195
195
|
ON KEYS convo.sourceId
|
|
196
196
|
|
|
197
197
|
WHERE convo.\`group\` = true
|
|
198
|
-
AND convo.sourceType = "${sourceType}"
|
|
199
|
-
AND convo.sourceId = "${sourceId}"
|
|
198
|
+
${sourceType ? `AND convo.sourceType = "${sourceType}"` : ''}
|
|
199
|
+
${sourceId ? `AND convo.sourceId = "${sourceId}"` : ''}
|
|
200
200
|
AND convo.owner = "${owner}"
|
|
201
201
|
LIMIT 1;
|
|
202
202
|
`;
|
|
@@ -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,
|
|
@@ -3,7 +3,7 @@ import {UserModel, UserType} from '@roadmanjs/auth';
|
|
|
3
3
|
import {ContextType} from './ContextType';
|
|
4
4
|
import {log} from '@roadmanjs/logs';
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
import {sendMessageToUser} from '@roadmanjs/push';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Publish any message to a topic
|
|
@@ -53,8 +53,8 @@ export const sendPushNotification = async (
|
|
|
53
53
|
|
|
54
54
|
const fullnames = sender.fullname || sender.firstname + ' ' + sender.lastname;
|
|
55
55
|
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
// TODO send push notification, use events to avoid direct import / dependency
|
|
57
|
+
const sentMessage = await sendMessageToUser(owner, {
|
|
58
58
|
data: {
|
|
59
59
|
type: 'chat',
|
|
60
60
|
...data,
|
|
@@ -64,26 +64,9 @@ export const sendPushNotification = async (
|
|
|
64
64
|
body: message.substring(0, 50),
|
|
65
65
|
imageUrl: imageUrl,
|
|
66
66
|
},
|
|
67
|
-
};
|
|
68
|
-
// TODO send push notification, use events to avoid direct import / dependency
|
|
69
|
-
// import {sendMessageToUser} from '@roadmanjs/push';
|
|
70
|
-
/**
|
|
71
|
-
*
|
|
72
|
-
const sentMessage = await sendMessageToUser(owner, {
|
|
73
|
-
data: {
|
|
74
|
-
type: 'chat',
|
|
75
|
-
...data,
|
|
76
|
-
},
|
|
77
|
-
notification: {
|
|
78
|
-
title: `Message from ${fullnames}`,
|
|
79
|
-
body: message.substring(0, 50),
|
|
80
|
-
imageUrl: imageUrl,
|
|
81
|
-
},
|
|
82
|
-
});
|
|
67
|
+
});
|
|
83
68
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
*/
|
|
69
|
+
log('sent push notification', sentMessage);
|
|
87
70
|
|
|
88
71
|
return sentMessage;
|
|
89
72
|
}
|