stream-chat-react-native-core 5.7.1-beta.1 → 5.8.0-beta.2

package/lib/module/index.js

@@ -180,6 +180,20 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 
+var _patchMessageTextCommand = require("./utils/patchMessageTextCommand");
+
+Object.keys(_patchMessageTextCommand).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _patchMessageTextCommand[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _patchMessageTextCommand[key];
+    }
+  });
+});
+
 var _Streami18n = require("./utils/Streami18n");
 
 Object.keys(_Streami18n).forEach(function (key) {

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;AACA;;AAEA","sourcesContent":["export * from './components';\nexport * from './hooks';\nexport { registerNativeHandlers, NetInfo } from './native';\nexport * from './contexts';\nexport * from './emoji-data/compiled';\n\nexport * from './icons';\n\nexport * from './types/types';\n\nexport * from './utils/Streami18n';\nexport * from './utils/utils';\n\nexport { default as enTranslations } from './i18n/en.json';\nexport { default as frTranslations } from './i18n/fr.json';\nexport { default as hiTranslations } from './i18n/hi.json';\nexport { default as itTranslations } from './i18n/it.json';\nexport { default as nlTranslations } from './i18n/nl.json';\nexport { default as ruTranslations } from './i18n/ru.json';\nexport { default as trTranslations } from './i18n/tr.json';\nexport { default as heTranslations } from './i18n/he.json';\n\nexport { QuickSqliteClient } from './store/QuickSqliteClient';\nexport { version } from './version.json';\n\nimport * as OfflineStoreApis from './store/apis';\nexport { OfflineStoreApis };\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;AACA;;AAEA","sourcesContent":["export * from './components';\nexport * from './hooks';\nexport { registerNativeHandlers, NetInfo } from './native';\nexport * from './contexts';\nexport * from './emoji-data/compiled';\n\nexport * from './icons';\n\nexport * from './types/types';\n\nexport * from './utils/patchMessageTextCommand';\nexport * from './utils/Streami18n';\nexport * from './utils/utils';\n\nexport { default as enTranslations } from './i18n/en.json';\nexport { default as frTranslations } from './i18n/fr.json';\nexport { default as hiTranslations } from './i18n/hi.json';\nexport { default as itTranslations } from './i18n/it.json';\nexport { default as nlTranslations } from './i18n/nl.json';\nexport { default as ruTranslations } from './i18n/ru.json';\nexport { default as trTranslations } from './i18n/tr.json';\nexport { default as heTranslations } from './i18n/he.json';\n\nexport { QuickSqliteClient } from './store/QuickSqliteClient';\nexport { version } from './version.json';\n\nimport * as OfflineStoreApis from './store/apis';\nexport { OfflineStoreApis };\n"]}

package/lib/module/utils/patchMessageTextCommand.js

@@ -0,0 +1,26 @@
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.patchMessageTextCommand = patchMessageTextCommand;
+
+function patchMessageTextCommand(messageText, mentionedUserIds) {
+  if (mentionedUserIds.length === 0) {
+    return messageText;
+  }
+
+  var trimmedMessageText = messageText.trim();
+
+  if (trimmedMessageText.startsWith('/mute ') || trimmedMessageText.startsWith('/unmute ') || trimmedMessageText.startsWith('/unban ')) {
+    return trimmedMessageText.replace(/@.+/, "@" + mentionedUserIds[0]);
+  }
+
+  if (trimmedMessageText.startsWith('/ban ')) {
+    var _trimmedMessageText$s;
+
+    var reasonText = (_trimmedMessageText$s = trimmedMessageText.split(' ').pop()) != null ? _trimmedMessageText$s : '';
+    return ("/ban @" + mentionedUserIds[0] + " " + reasonText).trim();
+  }
+
+  return messageText;
+}
+//# sourceMappingURL=patchMessageTextCommand.js.map

package/lib/module/utils/patchMessageTextCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["patchMessageTextCommand.ts"],"names":["patchMessageTextCommand","messageText","mentionedUserIds","length","trimmedMessageText","trim","startsWith","replace","reasonText","split","pop"],"mappings":";;;;;AAQO,SAASA,uBAAT,CAAiCC,WAAjC,EAAsDC,gBAAtD,EAA0F;AAC/F,MAAIA,gBAAgB,CAACC,MAAjB,KAA4B,CAAhC,EAAmC;AACjC,WAAOF,WAAP;AACD;;AACD,MAAMG,kBAAkB,GAAGH,WAAW,CAACI,IAAZ,EAA3B;;AAKA,MACED,kBAAkB,CAACE,UAAnB,CAA8B,QAA9B,KACAF,kBAAkB,CAACE,UAAnB,CAA8B,UAA9B,CADA,IAEAF,kBAAkB,CAACE,UAAnB,CAA8B,SAA9B,CAHF,EAIE;AACA,WAAOF,kBAAkB,CAACG,OAAnB,CAA2B,KAA3B,QAAsCL,gBAAgB,CAAC,CAAD,CAAtD,CAAP;AACD;;AAKD,MAAIE,kBAAkB,CAACE,UAAnB,CAA8B,OAA9B,CAAJ,EAA4C;AAAA;;AAC1C,QAAME,UAAU,4BAAGJ,kBAAkB,CAACK,KAAnB,CAAyB,GAAzB,EAA8BC,GAA9B,EAAH,oCAA0C,EAA1D;AACA,WAAO,YAASR,gBAAgB,CAAC,CAAD,CAAzB,SAAgCM,UAAhC,EAA6CH,IAA7C,EAAP;AACD;;AAED,SAAOJ,WAAP;AACD","sourcesContent":["/**\n * Converts a message text command to proper format\n * Example: \"/mute @username\" to \"/mute @userId\"\n * Supports \"/ban\", \"/unban\", \"/mute\", \"/unmute\"\n * @param messageText\n * @param mentionedUsers\n * @returns\n */\nexport function patchMessageTextCommand(messageText: string, mentionedUserIds: string[]): string {\n  if (mentionedUserIds.length === 0) {\n    return messageText;\n  }\n  const trimmedMessageText = messageText.trim();\n\n  /**\n   * The required formats are \"/unban @userid\" or \"/mute @userid\" or \"/unmute @userid\"\n   */\n  if (\n    trimmedMessageText.startsWith('/mute ') ||\n    trimmedMessageText.startsWith('/unmute ') ||\n    trimmedMessageText.startsWith('/unban ')\n  ) {\n    return trimmedMessageText.replace(/@.+/, `@${mentionedUserIds[0]}`);\n  }\n\n  /**\n   * The required format is \"/ban @userid reason\"\n   */\n  if (trimmedMessageText.startsWith('/ban ')) {\n    const reasonText = trimmedMessageText.split(' ').pop() ?? '';\n    return `/ban @${mentionedUserIds[0]} ${reasonText}`.trim();\n  }\n\n  return messageText;\n}\n"]}

package/lib/module/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.7.1-beta.1"
+  "version": "5.8.0-beta.2"
 }

package/lib/typescript/index.d.ts

@@ -5,6 +5,7 @@ export * from './contexts';
 export * from './emoji-data/compiled';
 export * from './icons';
 export * from './types/types';
+export * from './utils/patchMessageTextCommand';
 export * from './utils/Streami18n';
 export * from './utils/utils';
 export { default as enTranslations } from './i18n/en.json';

package/lib/typescript/utils/__tests__/patchMessageTextCommand.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/typescript/utils/patchMessageTextCommand.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Converts a message text command to proper format
+ * Example: "/mute @username" to "/mute @userId"
+ * Supports "/ban", "/unban", "/mute", "/unmute"
+ * @param messageText
+ * @param mentionedUsers
+ * @returns
+ */
+export declare function patchMessageTextCommand(messageText: string, mentionedUserIds: string[]): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "5.7.1-beta.1",
+  "version": "5.8.0-beta.2",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Channel/Channel.tsx

@@ -79,6 +79,7 @@ import * as dbApi from '../../store/apis';
 import type { DefaultStreamChatGenerics } from '../../types/types';
 import { addReactionToLocalState } from '../../utils/addReactionToLocalState';
 import { DBSyncManager } from '../../utils/DBSyncManager';
+import { patchMessageTextCommand } from '../../utils/patchMessageTextCommand';
 import { removeReactionFromLocalState } from '../../utils/removeReactionFromLocalState';
 import { generateRandomId, isLocalUrl, MessageStatusTypes, ReactionData } from '../../utils/utils';
 import { Attachment as AttachmentDefault } from '../Attachment/Attachment';
@@ -1332,12 +1333,14 @@ const ChannelWithContext = <
       } = updatedMessage;
       if (!channel.id) return;
 
+      const mentionedUserIds = mentioned_users?.map((user) => user.id) || [];
+
       const messageData = {
         attachments,
         id,
-        mentioned_users: mentioned_users?.map((mentionedUser) => mentionedUser.id) || [],
+        mentioned_users: mentionedUserIds,
         parent_id,
-        text,
+        text: patchMessageTextCommand(text ?? '', mentionedUserIds),
         ...extraFields,
       } as StreamMessage<StreamChatGenerics>;
 

package/src/index.ts

@@ -8,6 +8,7 @@ export * from './icons';
 
 export * from './types/types';
 
+export * from './utils/patchMessageTextCommand';
 export * from './utils/Streami18n';
 export * from './utils/utils';
 

package/src/utils/__tests__/patchMessageTextCommand.test.ts

@@ -0,0 +1,14 @@
+import { patchMessageTextCommand } from '../patchMessageTextCommand';
+
+describe('patchMessageTextCommand', () => {
+  test.each<[string, string, string[]]>([
+    ['/ban @santhosh vaiyapuri reason', '/ban @santhosh reason', ['santhosh']],
+    ['/ban @santhosh vaiyapuri', '/ban @santhosh vaiyapuri', ['santhosh']],
+    ['/ban @santhosh', '/ban @santhosh @santhosh', ['santhosh']],
+    ['/ban @santhosh vaiyapuri @khushal reason', '/ban @santhosh reason', ['santhosh', 'khushal']],
+    ['/mute @santhosh vaiyapuri', '/mute @santhosh', ['santhosh']],
+    ['/mute @santhosh vaiyapuri @khushal reason', '/mute @santhosh', ['santhosh', 'khushal']],
+  ])('Patch message with text:"%s" to "%s")', (input, expectedOutput, mentionedUserIds) => {
+    expect(patchMessageTextCommand(input, mentionedUserIds)).toBe(expectedOutput);
+  });
+});

package/src/utils/patchMessageTextCommand.ts

@@ -0,0 +1,35 @@
+/**
+ * Converts a message text command to proper format
+ * Example: "/mute @username" to "/mute @userId"
+ * Supports "/ban", "/unban", "/mute", "/unmute"
+ * @param messageText
+ * @param mentionedUsers
+ * @returns
+ */
+export function patchMessageTextCommand(messageText: string, mentionedUserIds: string[]): string {
+  if (mentionedUserIds.length === 0) {
+    return messageText;
+  }
+  const trimmedMessageText = messageText.trim();
+
+  /**
+   * The required formats are "/unban @userid" or "/mute @userid" or "/unmute @userid"
+   */
+  if (
+    trimmedMessageText.startsWith('/mute ') ||
+    trimmedMessageText.startsWith('/unmute ') ||
+    trimmedMessageText.startsWith('/unban ')
+  ) {
+    return trimmedMessageText.replace(/@.+/, `@${mentionedUserIds[0]}`);
+  }
+
+  /**
+   * The required format is "/ban @userid reason"
+   */
+  if (trimmedMessageText.startsWith('/ban ')) {
+    const reasonText = trimmedMessageText.split(' ').pop() ?? '';
+    return `/ban @${mentionedUserIds[0]} ${reasonText}`.trim();
+  }
+
+  return messageText;
+}

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.7.1-beta.1"
+  "version": "5.8.0-beta.2"
 }