stream-chat-react-native-core 5.27.0-beta.11 → 5.27.0-beta.12

package/lib/typescript/i18n/pt-BR.json

@@ -1,79 +1,79 @@
 {
     "1 Reply": "1 Resposta",
-    "1 Thread Reply": "1 Resposta de Thread",
+    "1 Thread Reply": "",
     "Allow access to your Gallery": "",
     "Allow camera access in device settings": "",
     "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "",
-    "Are you sure?": "Tem certeza?",
-    "Block User": "",
-    "Cancel": "",
-    "Cannot Flag Message": "",
-    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Considere como seu comentário pode fazer os outros se sentirem e certifique-se de seguir nossas Diretrizes da Comunidade",
-    "Copy Message": "",
-    "Delete": "",
-    "Delete Message": "",
+    "Are you sure you want to permanently delete this message?": "Tem certeza de que deseja excluir esta mensagem permanentemente?",
+    "Are you sure?": "",
+    "Block User": "Bloquear Usuário",
+    "Cancel": "Cancelar",
+    "Cannot Flag Message": "Não é possível reportar a mensagem",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "",
+    "Copy Message": "Copiar Mensagem",
+    "Delete": "Excluir",
+    "Delete Message": "Excluir Mensagem",
     "Device camera is used to take photos or videos.": "",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "",
-    "Edit Message": "",
-    "Editing Message": "Editando Mensagem",
-    "Emoji matching": "Correspondência de Emoji",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "Deseja enviar uma cópia desta mensagem para um moderador para investigação adicional?",
+    "Edit Message": "Editar Mensagem",
+    "Editing Message": "",
+    "Emoji matching": "",
     "Empty message...": "Mensagem vazia...",
-    "Error loading": "Erro ao carregar",
+    "Error loading": "",
     "Error loading channel list...": "Erro ao carregar lista de canais...",
     "Error loading messages for this channel...": "Erro ao carregar mensagens para este canal...",
     "Error while loading, please reload/refresh": "Erro ao carregar, por favor recarregue/atualize",
     "File type not supported": "",
-    "Flag": "",
-    "Flag Message": "",
-    "Flag action failed either due to a network issue or the message is already flagged": "",
+    "Flag": "Reportar",
+    "Flag Message": "Reportar Mensagem",
+    "Flag action failed either due to a network issue or the message is already flagged": "A ação para reportar a mensagem falhou devido a um problema de rede ou a mensagem já foi reportada.",
     "How about sending your first message to a friend?": "Que tal enviar sua primeira mensagem para um amigo?",
-    "Instant Commands": "Comandos Instantâneos",
+    "Instant Commands": "",
     "Let's start chatting!": "Vamos começar a conversar!",
     "Links are disabled": "Links estão desabilitados",
-    "Loading channels...": "",
-    "Loading messages...": "",
-    "Loading...": "",
+    "Loading channels...": "Carregando canais...",
+    "Loading messages...": "Carregando mensagens...",
+    "Loading...": "Carregando...",
     "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Limite máximo de tamanho de arquivo atingido. Por favor, faça o upload de um arquivo abaixo de {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.",
-    "Message Reactions": "",
+    "Message Reactions": "Reações à Mensagem",
     "Message deleted": "Mensagem excluída",
-    "Message flagged": "",
-    "Mute User": "",
+    "Message flagged": "Mensagem sinalizada",
+    "Mute User": "Silenciar Usuário",
     "Not supported": "",
     "Nothing yet...": "Nada ainda...",
-    "Ok": "",
-    "Only visible to you": "Apenas visível para você",
+    "Ok": "Ok",
+    "Only visible to you": "",
     "Open Settings": "",
     "Photo": "Foto",
     "Photos and Videos": "",
-    "Pin to Conversation": "",
+    "Pin to Conversation": "Fixar na Conversa",
     "Pinned by": "",
     "Please enable access to your photos and videos so you can share them.": "",
-    "Please select a channel first": "",
+    "Please select a channel first": "Por favor, selecione um canal primeiro",
     "Reconnecting...": "Reconectando...",
-    "Reply": "",
+    "Reply": "Responder",
     "Reply to Message": "",
-    "Resend": "",
-    "Search GIFs": "",
+    "Resend": "Reenviar",
+    "Search GIFs": "Pesquisar GIFs",
     "Select More Photos": "",
-    "Send Anyway": "Enviar de qualquer maneira",
-    "Send a message": "",
+    "Send Anyway": "",
+    "Send a message": "Enviar uma mensagem",
     "Sending links is not allowed in this conversation": "Não é permitido enviar links nesta conversa",
-    "Slow mode ON": "",
-    "The message has been reported to a moderator.": "",
-    "Thread Reply": "",
-    "Unblock User": "",
+    "Slow mode ON": "Modo Lento ATIVADO",
+    "The message has been reported to a moderator.": "A mensagem foi relatada a um moderador.",
+    "Thread Reply": "Respostas de Tópico",
+    "Unblock User": "Desbloquear Usuário",
     "Unknown User": "",
-    "Unmute User": "",
-    "Unpin from Conversation": "",
-    "Unread Messages": "",
+    "Unmute User": "Remover usuário do modo silencioso",
+    "Unpin from Conversation": "Desmarcar como fixado na conversa",
+    "Unread Messages": "Mensagens não lidas",
     "Video": "Vídeo",
     "You": "Você",
     "You can't send messages in this channel": "",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} e mais {{ nonSelfUserLength }} pessoa(s) estão digitando",
     "{{ index }} of {{ photoLength }}": "",
     "{{ replyCount }} Replies": "{{ replyCount }} Respostas",
-    "{{ replyCount }} Thread Replies": "{{ replyCount }} Respostas de Thread",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "{{ user }} está digitando",
     "🏙 Attachment...": "🏙 Anexo..."
 }

package/lib/typescript/i18n/ru.json

@@ -1,79 +1,79 @@
 {
     "1 Reply": "1 Ответ",
-    "1 Thread Reply": "1 тема Ответить",
+    "1 Thread Reply": "",
     "Allow access to your Gallery": "",
     "Allow camera access in device settings": "",
     "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "",
-    "Are you sure?": "Вы уверены?",
-    "Block User": "",
-    "Cancel": "",
-    "Cannot Flag Message": "",
-    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Обдумайте, как ваш комментарий может повлиять на других, и убедитесь, что вы следуете нашим правилам сообщества",
-    "Copy Message": "",
-    "Delete": "",
-    "Delete Message": "",
+    "Are you sure you want to permanently delete this message?": "Вы действительно хотите удалить это сообщение без возможности восстановления?",
+    "Are you sure?": "",
+    "Block User": "Заблокировать пользователя",
+    "Cancel": "Отмена",
+    "Cannot Flag Message": "Невозможно пожаловаться на сообщение",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "",
+    "Copy Message": "Копировать сообщение",
+    "Delete": "удалять",
+    "Delete Message": "Удалить сообщение",
     "Device camera is used to take photos or videos.": "",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "",
-    "Edit Message": "",
-    "Editing Message": "Редактирование сообщения",
-    "Emoji matching": "Соответствие эмодзи",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "Вы хотите отправить копию этого сообщения модератору для дальнейшего изучения?",
+    "Edit Message": "Редактировать сообщение",
+    "Editing Message": "",
+    "Emoji matching": "",
     "Empty message...": "Пустое сообщение...",
-    "Error loading": "Ошибка при загрузке",
+    "Error loading": "",
     "Error loading channel list...": "Ошибка загрузки списка каналов...",
     "Error loading messages for this channel...": "Ошибка загрузки сообщений для этого канала...",
     "Error while loading, please reload/refresh": "Ошибка загрузки, пожалуйста перезагрузите или обновите",
     "File type not supported": "",
-    "Flag": "",
-    "Flag Message": "",
-    "Flag action failed either due to a network issue or the message is already flagged": "",
+    "Flag": "Пометить",
+    "Flag Message": "Пометить сообщение",
+    "Flag action failed either due to a network issue or the message is already flagged": "Не удалось отправить жалобу. Возможные причины: проблема с подключением к интернету или ваша жалоба уже была принята.",
     "How about sending your first message to a friend?": "Как насчет отправки первого сообщения другу?",
-    "Instant Commands": "Мгновенные Команды",
+    "Instant Commands": "",
     "Let's start chatting!": "Давайте начнем общаться!",
     "Links are disabled": "Ссылки отключены",
-    "Loading channels...": "",
-    "Loading messages...": "",
-    "Loading...": "",
+    "Loading channels...": "Загружаю каналы...",
+    "Loading messages...": "Загружаю сообщения...",
+    "Loading...": "Загружаю...",
     "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Достигнут предел максимального размера файла для загрузки. Загрузите файл размером менее {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} МБ.",
-    "Message Reactions": "",
+    "Message Reactions": "Сообщения Реакции",
     "Message deleted": "Сообщение удалено",
-    "Message flagged": "",
-    "Mute User": "",
+    "Message flagged": "Сообщение отмечено",
+    "Mute User": "Отключить пользователя",
     "Not supported": "",
     "Nothing yet...": "Пока ничего нет...",
-    "Ok": "",
-    "Only visible to you": "Видно только вам",
+    "Ok": "Oк",
+    "Only visible to you": "",
     "Open Settings": "",
     "Photo": "Фото",
     "Photos and Videos": "",
-    "Pin to Conversation": "",
+    "Pin to Conversation": "Закрепить к беседе",
     "Pinned by": "",
     "Please enable access to your photos and videos so you can share them.": "",
-    "Please select a channel first": "",
+    "Please select a channel first": "Пожалуйста, сначала выберите канал",
     "Reconnecting...": "Переподключение...",
-    "Reply": "",
+    "Reply": "Ответить",
     "Reply to Message": "",
-    "Resend": "",
-    "Search GIFs": "",
+    "Resend": "Отправить",
+    "Search GIFs": "Поиск GIF",
     "Select More Photos": "",
-    "Send Anyway": "Всё равно отправить",
-    "Send a message": "",
+    "Send Anyway": "",
+    "Send a message": "Отправить сообщение",
     "Sending links is not allowed in this conversation": "Отправка ссылок недоступна в этом чате",
-    "Slow mode ON": "",
-    "The message has been reported to a moderator.": "",
-    "Thread Reply": "",
-    "Unblock User": "",
+    "Slow mode ON": "Медленный режим включен",
+    "The message has been reported to a moderator.": "Сообщение отправлено модератору.",
+    "Thread Reply": "Тема Ответить",
+    "Unblock User": "Разблокировать пользователя",
     "Unknown User": "",
-    "Unmute User": "",
-    "Unpin from Conversation": "",
-    "Unread Messages": "",
+    "Unmute User": "Включить микрофон",
+    "Unpin from Conversation": "Открепить от беседы",
+    "Unread Messages": "Непрочитанные Сообщения",
     "Video": "видео",
     "You": "Вы",
     "You can't send messages in this channel": "",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} и еще {{ nonSelfUserLength }} пишут",
     "{{ index }} of {{ photoLength }}": "",
     "{{ replyCount }} Replies": "{{ replyCount }} Ответов",
-    "{{ replyCount }} Thread Replies": "{{replyCount}} Ответы в темах",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "{{ user }} пишет",
     "🏙 Attachment...": "🏙 Вложение..."
 }

package/lib/typescript/i18n/tr.json

@@ -1,79 +1,79 @@
 {
     "1 Reply": "1 Cevap",
-    "1 Thread Reply": "1 Konu Yanıtı",
+    "1 Thread Reply": "",
     "Allow access to your Gallery": "",
     "Allow camera access in device settings": "",
     "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "",
-    "Are you sure?": "Emin misiniz?",
-    "Block User": "",
-    "Cancel": "",
-    "Cannot Flag Message": "",
-    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Yorumunuzun diğerlerini nasıl hissettirebileceğini düşünün ve topluluk kurallarımızı takip ettiğinizden emin olun",
-    "Copy Message": "",
-    "Delete": "",
-    "Delete Message": "",
+    "Are you sure you want to permanently delete this message?": "Bu mesajı kalıcı olarak silmek istediğinizden emin misiniz?",
+    "Are you sure?": "",
+    "Block User": "Kullanıcıyı engelle",
+    "Cancel": "İptal",
+    "Cannot Flag Message": "Raporlama Başarısız",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "",
+    "Copy Message": "Mesajı Kopyala",
+    "Delete": "Sil",
+    "Delete Message": "Mesajı Sil",
     "Device camera is used to take photos or videos.": "",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "",
-    "Edit Message": "",
-    "Editing Message": "Mesaj Düzenleniyor",
-    "Emoji matching": "Emoji eşleştirme",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "Detaylı inceleme için bu mesajın kopyasını moderatöre göndermek istiyor musunuz?",
+    "Edit Message": "Mesajı Düzenle",
+    "Editing Message": "",
+    "Emoji matching": "",
     "Empty message...": "Boş mesaj...",
-    "Error loading": "Yükleme hatası",
+    "Error loading": "",
     "Error loading channel list...": "Kanal listesi yüklenirken hata oluştu...",
     "Error loading messages for this channel...": "Bu kanal için mesajlar yüklenirken hata oluştu...",
     "Error while loading, please reload/refresh": "Yüklenirken hata oluştu, lütfen tekrar deneyiniz",
     "File type not supported": "",
-    "Flag": "",
-    "Flag Message": "",
-    "Flag action failed either due to a network issue or the message is already flagged": "",
+    "Flag": "Raporla",
+    "Flag Message": "Mesajı Raporla",
+    "Flag action failed either due to a network issue or the message is already flagged": "Mesajın daha önce raporlanmış olması veya bir ağ bağlantısı sorunu nedeniyle raporlama işlemi başarısız oldu.",
     "How about sending your first message to a friend?": "İlk mesajınızı bir arkadaşınıza göndermeye ne dersiniz?",
-    "Instant Commands": "Anlık Komutlar",
+    "Instant Commands": "",
     "Let's start chatting!": "Haydi sohbete başlayalım!",
     "Links are disabled": "Bağlantılar devre dışı",
-    "Loading channels...": "",
-    "Loading messages...": "",
-    "Loading...": "",
+    "Loading channels...": "Kanallar yükleniyor...",
+    "Loading messages...": "Mesajlar yükleniyor...",
+    "Loading...": "Yükleniyor...",
     "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Maksimum dosya boyutu yükleme sınırına ulaşıldı. Lütfen {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB'ın altında bir dosya yükleyin.",
-    "Message Reactions": "",
+    "Message Reactions": "Mesaj Tepkileri",
     "Message deleted": "Mesaj silindi",
-    "Message flagged": "",
-    "Mute User": "",
+    "Message flagged": "Mesaj işaretlendi",
+    "Mute User": "Kullanıcıyı sessize al",
     "Not supported": "",
     "Nothing yet...": "Henüz değil...",
-    "Ok": "",
-    "Only visible to you": "Sadece siz görebilirsiniz",
+    "Ok": "Tamam",
+    "Only visible to you": "",
     "Open Settings": "",
     "Photo": "Fotoğraf",
     "Photos and Videos": "",
-    "Pin to Conversation": "",
+    "Pin to Conversation": "Konuşmaya sabitle",
     "Pinned by": "",
     "Please enable access to your photos and videos so you can share them.": "",
-    "Please select a channel first": "",
+    "Please select a channel first": "Lütfen önce bir kanal seçiniz",
     "Reconnecting...": "Yeniden Bağlanılıyor...",
-    "Reply": "",
+    "Reply": "Yanıtla",
     "Reply to Message": "",
-    "Resend": "",
-    "Search GIFs": "",
+    "Resend": "Yeniden gönder",
+    "Search GIFs": "GIF Ara",
     "Select More Photos": "",
-    "Send Anyway": "Yine de Gönder",
-    "Send a message": "",
+    "Send Anyway": "",
+    "Send a message": "Mesaj gönder",
     "Sending links is not allowed in this conversation": "Bu konuşmada bağlantı göndermek desteklenmiyor",
-    "Slow mode ON": "",
-    "The message has been reported to a moderator.": "",
-    "Thread Reply": "",
-    "Unblock User": "",
+    "Slow mode ON": "Yavaş Mod Açık",
+    "The message has been reported to a moderator.": "Mesaj moderatöre bildirildi.",
+    "Thread Reply": "Konu Yanıtı",
+    "Unblock User": "Kullanıcının engelini kaldır",
     "Unknown User": "",
-    "Unmute User": "",
-    "Unpin from Conversation": "",
-    "Unread Messages": "",
+    "Unmute User": "Kullanıcının sesini aç",
+    "Unpin from Conversation": "Sabitlemeyi kaldır",
+    "Unread Messages": "Okunmamış Mesajlar",
     "Video": "Video",
     "You": "Sen",
     "You can't send messages in this channel": "",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} ve {{ nonSelfUserLength }} kişi daha yazıyor",
     "{{ index }} of {{ photoLength }}": "",
     "{{ replyCount }} Replies": "{{ replyCount }} Cevap",
-    "{{ replyCount }} Thread Replies": "{{responseCount}} Konu Cevapı",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "{{ user }} yazıyor",
     "🏙 Attachment...": "🏙 Ek..."
 }

package/lib/typescript/store/apis/upsertChannelDataFromChannel.d.ts

@@ -0,0 +1,6 @@
+import { DefaultStreamChatGenerics } from 'src/types/types';
+import type { Channel } from 'stream-chat';
+export declare const upsertChannelDataFromChannel: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>({ channel, flush, }: {
+    channel: Channel<StreamChatGenerics>;
+    flush?: boolean | undefined;
+}) => import("../types").PreparedQueries[] | undefined;

package/lib/typescript/store/mappers/mapChannelToStorable.d.ts

@@ -0,0 +1,4 @@
+import type { Channel } from 'stream-chat';
+import type { DefaultStreamChatGenerics } from '../../types/types';
+import type { TableRow } from '../types';
+export declare const mapChannelToStorable: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(channel: Channel<StreamChatGenerics>) => TableRow<'channels'> | undefined;

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

@@ -26,7 +26,7 @@ export declare class DBSyncManager {
     static onSyncStatusChange: (listener: (status: boolean) => void) => {
         unsubscribe: () => void;
     };
-    static sync: () => Promise<void>;
+    static sync: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(client: StreamChat<StreamChatGenerics>) => Promise<void>;
     static syncAndExecutePendingTasks: () => Promise<void>;
     static queueTask: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>({ client, task, }: {
         client: StreamChat<StreamChatGenerics>;

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.27.0-beta.11",
+  "version": "5.27.0-beta.12",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Chat/hooks/handleEventToSyncDB.ts

@@ -1,74 +1,152 @@
-import type { Event } from 'stream-chat';
+import { DefaultStreamChatGenerics } from 'src/types/types';
+import type { Event, StreamChat } from 'stream-chat';
 
 import { deleteChannel } from '../../../store/apis/deleteChannel';
 import { deleteMember } from '../../../store/apis/deleteMember';
 import { deleteMessagesForChannel } from '../../../store/apis/deleteMessagesForChannel';
 import { updateMessage } from '../../../store/apis/updateMessage';
 import { upsertChannelData } from '../../../store/apis/upsertChannelData';
+import { upsertChannelDataFromChannel } from '../../../store/apis/upsertChannelDataFromChannel';
 import { upsertChannels } from '../../../store/apis/upsertChannels';
 import { upsertMembers } from '../../../store/apis/upsertMembers';
 import { upsertMessages } from '../../../store/apis/upsertMessages';
 import { upsertReads } from '../../../store/apis/upsertReads';
+import { QuickSqliteClient } from '../../../store/QuickSqliteClient';
+import { createSelectQuery } from '../../../store/sqlite-utils/createSelectQuery';
+import { PreparedQueries } from '../../../store/types';
 
-export const handleEventToSyncDB = (event: Event, flush?: boolean) => {
+export const handleEventToSyncDB = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  event: Event,
+  client: StreamChat<StreamChatGenerics>,
+  flush?: boolean,
+) => {
   const { type } = event;
 
+  // This function is used to guard the queries that require channel to be present in the db first
+  // If channel is not present in the db, we first fetch the channel data from the channel object
+  // and then add the queries with a channel create query first
+  const queriesWithChannelGuard = (
+    createQueries: (flushOverride?: boolean) => PreparedQueries[],
+  ) => {
+    const cid = event.cid || event.channel?.cid;
+
+    if (!cid) return createQueries(flush);
+    const channels = QuickSqliteClient.executeSql.apply(
+      null,
+      createSelectQuery('channels', ['cid'], {
+        cid,
+      }),
+    );
+    // a channel is not present in the db, we first fetch the channel data from the channel object.
+    // this can happen for example when a message.new event is received for a channel that is not in the db due to a channel being hidden.
+    if (channels.length === 0) {
+      const channel =
+        event.channel_type && event.channel_id
+          ? client.channel(event.channel_type, event.channel_id)
+          : undefined;
+      if (channel && channel.initialized && !channel.disconnected) {
+        const channelQuery = upsertChannelDataFromChannel({
+          channel,
+          flush,
+        });
+        if (channelQuery) {
+          const newQueries = [...channelQuery, ...createQueries(false)];
+          if (flush !== false) {
+            QuickSqliteClient.executeSqlBatch(newQueries);
+          }
+          return newQueries;
+        } else {
+          console.warn(
+            `Couldnt create channel queries on ${type} event for an initialized channel that is not in DB, skipping event`,
+            { event },
+          );
+          return [];
+        }
+      } else {
+        console.warn(
+          `Received ${type} event for a non initialized channel that is not in DB, skipping event`,
+          { event },
+        );
+        return [];
+      }
+    }
+    return createQueries(flush);
+  };
+
   if (type === 'message.read') {
-    if (event.user?.id && event.cid) {
-      return upsertReads({
-        cid: event.cid,
-        flush,
-        reads: [
-          {
-            last_read: event.received_at as string,
-            unread_messages: 0,
-            user: event.user,
-          },
-        ],
-      });
+    const cid = event.cid;
+    const user = event.user;
+    if (user?.id && cid) {
+      return queriesWithChannelGuard((flushOverride) =>
+        upsertReads({
+          cid,
+          flush: flushOverride,
+          reads: [
+            {
+              last_read: event.received_at as string,
+              unread_messages: 0,
+              user,
+            },
+          ],
+        }),
+      );
     }
   }
 
   if (type === 'message.new') {
-    if (event.message && (!event.message.parent_id || event.message.show_in_channel)) {
-      return upsertMessages({
-        flush,
-        messages: [event.message],
-      });
+    const message = event.message;
+    if (message && (!message.parent_id || message.show_in_channel)) {
+      return queriesWithChannelGuard((flushOverride) =>
+        upsertMessages({
+          flush: flushOverride,
+          messages: [message],
+        }),
+      );
     }
   }
 
   if (type === 'message.updated' || type === 'message.deleted') {
-    if (event.message && !event.message.parent_id) {
+    const message = event.message;
+    if (message && !message.parent_id) {
       // Update only if it exists, otherwise event could be related
       // to a message which is not in database.
-      return updateMessage({
-        flush,
-        message: event.message,
-      });
+      return queriesWithChannelGuard((flushOverride) =>
+        updateMessage({
+          flush: flushOverride,
+          message,
+        }),
+      );
     }
   }
 
   if (type === 'reaction.updated') {
-    if (event.message && event.reaction) {
+    const message = event.message;
+    if (message && event.reaction) {
       // We update the entire message to make sure we also update
       // reaction_counts.
-      return updateMessage({
-        flush,
-        message: event.message,
-      });
+      return queriesWithChannelGuard((flushOverride) =>
+        updateMessage({
+          flush: flushOverride,
+          message,
+        }),
+      );
     }
   }
 
   if (type === 'reaction.new' || type === 'reaction.deleted') {
-    if (event.message && !event.message.parent_id) {
+    const message = event.message;
+    if (message && !message.parent_id) {
       // Here we are relying on the fact message.latest_reactions always includes
       // the new reaction. So we first delete all the existing reactions and populate
       // the reactions table with message.latest_reactions
-      return updateMessage({
-        flush,
-        message: event.message,
-      });
+      return queriesWithChannelGuard((flushOverride) =>
+        updateMessage({
+          flush: flushOverride,
+          message,
+        }),
+      );
     }
   }
 
@@ -119,22 +197,30 @@ export const handleEventToSyncDB = (event: Event, flush?: boolean) => {
   }
 
   if (type === 'member.added' || type === 'member.updated') {
-    if (event.member && event.cid) {
-      return upsertMembers({
-        cid: event.cid,
-        flush,
-        members: [event.member],
-      });
+    const member = event.member;
+    const cid = event.cid;
+    if (member && cid) {
+      return queriesWithChannelGuard((flushOverride) =>
+        upsertMembers({
+          cid,
+          flush: flushOverride,
+          members: [member],
+        }),
+      );
     }
   }
 
   if (type === 'member.removed') {
-    if (event.member && event.cid) {
-      return deleteMember({
-        cid: event.cid,
-        flush,
-        member: event.member,
-      });
+    const member = event.member;
+    const cid = event.cid;
+    if (member && cid) {
+      return queriesWithChannelGuard((flushOverride) =>
+        deleteMember({
+          cid,
+          flush: flushOverride,
+          member,
+        }),
+      );
     }
   }