Merge branch 'alpha' into feat/livechat-source-destination

RocketChat · Sep 24, 2024 · f4db9c4 · f4db9c4
2 parents c01ba17 + 9e0013a
commit f4db9c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/deno-runtime/lib/accessors/notifier.ts b/deno-runtime/lib/accessors/notifier.ts
@@ -1,12 +1,17 @@
 import type { IMessageBuilder, INotifier } from '@rocket.chat/apps-engine/definition/accessors';
 import type { ITypingOptions } from '@rocket.chat/apps-engine/definition/accessors/INotifier.ts';
-import { TypingScope } from '@rocket.chat/apps-engine/definition/accessors/INotifier.ts';
+import type { _TypingScope } from '@rocket.chat/apps-engine/definition/accessors/INotifier.ts';
 import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
 import { MessageBuilder } from './builders/MessageBuilder.ts';
 import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
 import * as Messenger from '../messenger.ts';
+import { require } from "../require.ts";
+
+const { TypingScope } = require('@rocket.chat/apps-engine/definition/accessors/INotifier.js') as {
+    TypingScope: typeof _TypingScope;
+};
 
 export class Notifier implements INotifier {
     private senderFn: typeof Messenger.sendRequest;

diff --git a/src/definition/ui/UIActionButtonContext.ts b/src/definition/ui/UIActionButtonContext.ts
@@ -4,5 +4,4 @@ export enum UIActionButtonContext {
     MESSAGE_BOX_ACTION = 'messageBoxAction',
     USER_DROPDOWN_ACTION = 'userDropdownAction',
     ROOM_SIDEBAR_ACTION = 'roomSideBarAction',
-    MESSAGE_TOOLBAR_STARS_ACTION = 'messageToolbarStarsAction',
 }
diff --git a/src/definition/uikit/IUIKitIncomingInteractionActionButton.ts b/src/definition/uikit/IUIKitIncomingInteractionActionButton.ts
@@ -64,24 +64,13 @@ interface IUIKitIncomingInteractionActionButtonRoom extends IUIKitIncomingIntera
     };
 }
 
-interface IUIKitIncomingInteractionActionButtonMessageToolbarStars extends IUIKitIncomingInteractionActionButtonBase {
-    message: IMessage;
-    room: IRoom;
-    tmid?: string;
-
-    payload: {
-        context: 'messageToolbarStarsAction';
-    };
-}
-
 interface IUIKitIncomingInteractionActionButtonUserDropdown extends IUIKitIncomingInteractionActionButtonBase {
     payload: {
         context: 'userDropdownAction';
     };
 }
 
 export type IUIKitIncomingInteractionActionButton =
-    | IUIKitIncomingInteractionActionButtonMessageToolbarStars
     | IUIKitIncomingInteractionActionButtonMessageBox
     | IUIKitIncomingInteractionActionButtonMessage
     | IUIKitIncomingInteractionActionButtonRoomSidebar