From 1f92cefbbe56bfaf8bf9ad78382ef159cd47abe2 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 25 Jun 2024 19:56:00 -0300 Subject: [PATCH] chore: LayoutBlock (#774) --- deno-runtime/lib/accessors/builders/MessageBuilder.ts | 6 +++--- src/definition/accessors/IMessageBuilder.ts | 8 ++++---- src/server/messages/Message.ts | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deno-runtime/lib/accessors/builders/MessageBuilder.ts b/deno-runtime/lib/accessors/builders/MessageBuilder.ts index f01725819..98cd919f7 100644 --- a/deno-runtime/lib/accessors/builders/MessageBuilder.ts +++ b/deno-runtime/lib/accessors/builders/MessageBuilder.ts @@ -1,4 +1,4 @@ -import { Block } from '@rocket.chat/ui-kit'; +import { LayoutBlock } from '@rocket.chat/ui-kit'; import type { IMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/IMessageBuilder.ts'; import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts'; @@ -184,7 +184,7 @@ export class MessageBuilder implements IMessageBuilder { return this.msg; } - public addBlocks(blocks: BlockBuilder | Array) { + public addBlocks(blocks: BlockBuilder | Array) { if (!Array.isArray(this.msg.blocks)) { this.msg.blocks = []; } @@ -198,7 +198,7 @@ export class MessageBuilder implements IMessageBuilder { return this as IMessageBuilder; } - public setBlocks(blocks: BlockBuilder | Array) { + public setBlocks(blocks: BlockBuilder | Array) { if (blocks instanceof BlockBuilder) { this.msg.blocks = blocks.getBlocks(); } else { diff --git a/src/definition/accessors/IMessageBuilder.ts b/src/definition/accessors/IMessageBuilder.ts index c02760f2e..024a4b123 100644 --- a/src/definition/accessors/IMessageBuilder.ts +++ b/src/definition/accessors/IMessageBuilder.ts @@ -1,4 +1,4 @@ -import type { Block } from '@rocket.chat/ui-kit'; +import type { LayoutBlock } from '@rocket.chat/ui-kit'; import type { IMessage, IMessageAttachment } from '../messages'; import type { RocketChatAssociationModel } from '../metadata'; @@ -210,19 +210,19 @@ export interface IMessageBuilder { * Adds a block collection to the message's * own collection */ - addBlocks(blocks: BlockBuilder | Array): IMessageBuilder; + addBlocks(blocks: BlockBuilder | Array): IMessageBuilder; /** * Sets the block collection of the message * * @param blocks */ - setBlocks(blocks: BlockBuilder | Array): IMessageBuilder; + setBlocks(blocks: BlockBuilder | Array): IMessageBuilder; /** * Gets the block collection of the message */ - getBlocks(): Array; + getBlocks(): Array; /** * Adds a custom field to the message. diff --git a/src/server/messages/Message.ts b/src/server/messages/Message.ts index 2993181f7..b4c020259 100644 --- a/src/server/messages/Message.ts +++ b/src/server/messages/Message.ts @@ -1,4 +1,4 @@ -import type { Block } from '@rocket.chat/ui-kit'; +import type { LayoutBlock } from '@rocket.chat/ui-kit'; import type { IMessage, IMessageAttachment, IMessageFile, IMessageReactions } from '../../definition/messages'; import type { IUser, IUserLookup } from '../../definition/users'; @@ -40,7 +40,7 @@ export class Message implements IMessage { public file?: IMessageFile; - public blocks?: Array; + public blocks?: Array; public starred?: Array<{ _id: string }>;