@messenger-box/platform-server 9.0.4-alpha.21 → 9.0.4-alpha.22
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.
|
@@ -8,19 +8,15 @@ import {Schema}from'mongoose';import {commonModeSchemaOptions,addIdVirtualFields
|
|
|
8
8
|
"PRIVATE" /* IRoomType.Private */,
|
|
9
9
|
"PUBLIC" /* IRoomType.Public */,
|
|
10
10
|
"VISITOR" /* IRoomType.Visitor */,
|
|
11
|
-
"SERVICE" /* IRoomType.Service
|
|
11
|
+
"SERVICE" /* IRoomType.Service */,
|
|
12
12
|
],
|
|
13
13
|
required: true,
|
|
14
14
|
},
|
|
15
15
|
orgName: {
|
|
16
16
|
type: Schema.Types.String,
|
|
17
17
|
required: function () {
|
|
18
|
-
return ![
|
|
19
|
-
|
|
20
|
-
"PUBLIC" /* IRoomType.Public */,
|
|
21
|
-
"SERVICE" /* IRoomType.Service */,
|
|
22
|
-
].includes(this.type);
|
|
23
|
-
}
|
|
18
|
+
return !["DIRECT" /* IRoomType.Direct */, "PUBLIC" /* IRoomType.Public */, "SERVICE" /* IRoomType.Service */].includes(this.type);
|
|
19
|
+
},
|
|
24
20
|
},
|
|
25
21
|
members: {
|
|
26
22
|
type: [
|
|
@@ -43,7 +39,7 @@ import {Schema}from'mongoose';import {commonModeSchemaOptions,addIdVirtualFields
|
|
|
43
39
|
message: 'Channel already exists',
|
|
44
40
|
validator: async function (members, type) {
|
|
45
41
|
// Extract the IDs of the users in the members array
|
|
46
|
-
const userIds = members.map(member => member.user.toString());
|
|
42
|
+
const userIds = members.map((member) => member.user.toString());
|
|
47
43
|
// Check if there are any duplicate user IDs
|
|
48
44
|
const uniqueUserIds = [...new Set(userIds)];
|
|
49
45
|
if (uniqueUserIds.length !== userIds.length) {
|
|
@@ -54,16 +50,31 @@ import {Schema}from'mongoose';import {commonModeSchemaOptions,addIdVirtualFields
|
|
|
54
50
|
}
|
|
55
51
|
// Check if any of the user IDs already exist in other direct channels
|
|
56
52
|
const orgName = this.orgName;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
53
|
+
if (this.type === "DIRECT" /* IRoomType.Direct */ && members?.length < 2) {
|
|
54
|
+
const filter = {
|
|
55
|
+
type: "DIRECT" /* IRoomType.Direct */,
|
|
56
|
+
orgName: orgName,
|
|
57
|
+
'members.user': { $all: members.map((m) => m.user) },
|
|
58
|
+
members: {
|
|
59
|
+
$size: 1,
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
const directChannels = await this.constructor.findOne(filter);
|
|
63
|
+
if (directChannels && Object.keys(directChannels).length > 0)
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
const filter = {
|
|
68
|
+
type: "DIRECT" /* IRoomType.Direct */,
|
|
69
|
+
orgName: orgName,
|
|
70
|
+
'members.user': { $all: members.map((m) => m.user) },
|
|
71
|
+
members: {
|
|
72
|
+
$size: 2,
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
const directChannels = await this.constructor.findOne(filter);
|
|
76
|
+
return !directChannels;
|
|
77
|
+
}
|
|
67
78
|
},
|
|
68
79
|
},
|
|
69
80
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sources":["../../../src/store/models/channel.ts"],"sourcesContent":[null],"names":[],"mappings":"2GAMA,MAAM,kBAAkB,GAAG,IAAI,MAAM,CACjC;AACI,IAAA,IAAI,EAAE;AACF,QAAA,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;AACzB,QAAA,IAAI,EAAE;;;;;;;;AAQL,SAAA;AACD,QAAA,QAAQ,EAAE,IAAI;AACjB,KAAA;AACD,IAAA,OAAO,EAAE;AACL,QAAA,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;AACzB,QAAA,QAAQ,EAAE,YAAA;
|
|
1
|
+
{"version":3,"file":"channel.js","sources":["../../../src/store/models/channel.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@messenger-box/platform-server",
|
|
3
|
-
"version": "9.0.4-alpha.
|
|
3
|
+
"version": "9.0.4-alpha.22",
|
|
4
4
|
"description": "Sample core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@container-stack/mailing-api": "5.2.1-alpha.2",
|
|
23
|
-
"@messenger-box/core": "9.0.4-alpha.
|
|
24
|
-
"@messenger-box/notification-api-core": "9.0.4-alpha.
|
|
23
|
+
"@messenger-box/core": "9.0.4-alpha.22",
|
|
24
|
+
"@messenger-box/notification-api-core": "9.0.4-alpha.22",
|
|
25
25
|
"@skoropletov/moleculer-cron-tasks": "~0.0.8",
|
|
26
26
|
"date-fns": "^2.28.0"
|
|
27
27
|
},
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"typescript": {
|
|
50
50
|
"definition": "lib/index.d.ts"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "6ed56ae2c9f2092c526ccd97b06b2856790c1634"
|
|
53
53
|
}
|