@roadmanjs/chat 1.3.3 → 1.3.4

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.
Files changed (4) hide show
  1. package/dist/shared/pubsub.utils.js +5 -2
  2. package/dist/shared/pubsub.utils.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/shared/pubsub.utils.ts +5 -2
package/dist/shared/pubsub.utils.js CHANGED
@@ -32,12 +32,15 @@ const sendPushNotification = async (senderId, data) => {
32
32
  const sender = await auth_1.UserModel.findById(senderId);
33
33
  if (sender) {
34
34
  const imageUrl = sender.avatar; // todo default
35
- const fullnames = sender.fullname || sender.firstname + ' ' + sender.lastname;
35
+ const { fullname, firstname, lastname } = sender;
36
+ const hasName = Boolean(fullname || firstname || lastname);
37
+ const fullnames = fullname || [firstname, lastname].filter(Boolean).join(' ');
38
+ const title = hasName ? `Message from ${fullnames}` : 'New Message';
36
39
  // TODO send push notification, use events to avoid direct import / dependency
37
40
  const sentMessage = await (0, push_1.sendMessageToUser)(owner, {
38
41
  data: Object.assign({ type: 'chat' }, data),
39
42
  notification: {
40
- title: `Message from ${fullnames}`,
43
+ title,
41
44
  body: message.substring(0, 50),
42
45
  imageUrl: imageUrl,
43
46
  },
package/dist/shared/pubsub.utils.js.map CHANGED
@@ -1 +1 @@
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"}
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,EAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAC,GAAG,MAAM,CAAC;YAE/C,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,IAAI,SAAS,IAAI,QAAQ,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAG,QAAQ,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9E,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YACpE,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;oBACL,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;AArCW,QAAA,oBAAoB,wBAqC/B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@roadmanjs/chat",
3
- "version": "1.3.3",
3
+ "version": "1.3.4",
4
4
  "description": " A roadman for chat and groups",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/shared/pubsub.utils.ts CHANGED
@@ -51,8 +51,11 @@ export const sendPushNotification = async (
51
51
  if (sender) {
52
52
  const imageUrl = sender.avatar; // todo default
53
53
 
54
- const fullnames = sender.fullname || sender.firstname + ' ' + sender.lastname;
54
+ const {fullname, firstname, lastname} = sender;
55
55
 
56
+ const hasName = Boolean(fullname || firstname || lastname);
57
+ const fullnames = fullname || [firstname, lastname].filter(Boolean).join(' ');
58
+ const title = hasName ? `Message from ${fullnames}` : 'New Message';
56
59
  // TODO send push notification, use events to avoid direct import / dependency
57
60
  const sentMessage = await sendMessageToUser(owner, {
58
61
  data: {
@@ -60,7 +63,7 @@ export const sendPushNotification = async (
60
63
  ...data,
61
64
  },
62
65
  notification: {
63
- title: `Message from ${fullnames}`,
66
+ title,
64
67
  body: message.substring(0, 50),
65
68
  imageUrl: imageUrl,
66
69
  },