Fix send giphy media

zer0-os · Mar 8, 2023 · 6bb9e51 · 6bb9e51
1 parent 5278242
commit 6bb9e51
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/src/components/message/index.tsx b/src/components/message/index.tsx
@@ -120,6 +120,10 @@ export class Message extends React.Component<Properties, State> {
     return this.props.isOwner;
   };
 
+  isMediaMessage = (): boolean => {
+    return !!this.props.media;
+  };
+
   deleteMessage = (): void => this.props.onDelete(this.props.messageId);
   toggleEdit = () => this.setState((state) => ({ isEditing: !state.isEditing }));
   editMessage = (content: string, mentionedUserIds: string[]) => {
@@ -154,6 +158,7 @@ export class Message extends React.Component<Properties, State> {
           onDelete={this.deleteMessage}
           onEdit={this.toggleEdit}
           onReply={this.onReply}
+          isMediaMessage={this.isMediaMessage()}
         />
       </div>
     );

diff --git a/src/platform-apps/channels/messages-menu/index.tsx b/src/platform-apps/channels/messages-menu/index.tsx
@@ -11,6 +11,7 @@ interface Properties {
   className: string;
   canEdit: boolean;
   canReply?: boolean;
+  isMediaMessage?: boolean;
 
   onDelete?: () => void;
   onEdit?: () => void;
@@ -32,7 +33,7 @@ export class MessageMenu extends React.Component<Properties, State> {
   renderItems = () => {
     const menuItems = [];
 
-    if (this.props.onReply && this.props.canReply) {
+    if (this.props.onReply && this.props.canReply && !this.props.isMediaMessage) {
       menuItems.push(
         <li
           className='menu-button reply-item'
@@ -54,7 +55,7 @@ export class MessageMenu extends React.Component<Properties, State> {
         </li>
       );
     }
-    if (this.props.onEdit && this.props.canEdit) {
+    if (this.props.onEdit && this.props.canEdit && !this.props.isMediaMessage) {
       menuItems.push(
         <li
           className='menu-button edit-item'

diff --git a/src/store/messages/api.ts b/src/store/messages/api.ts
@@ -2,7 +2,7 @@ import { del, get, post, put } from '../../lib/api/rest';
 import { ParentMessage } from '../../lib/chat/types';
 import { LinkPreview } from '../../lib/link-preview';
 import { Media, MessagesResponse } from './index';
-import { SendPayload } from './saga';
+import { FileUploadResult, SendPayload } from './saga';
 
 export async function fetchMessagesByChannelId(channelId: string, lastCreatedAt?: number): Promise<MessagesResponse> {
   const filter: any = {};
@@ -19,13 +19,17 @@ export async function sendMessagesByChannelId(
   channelId: string,
   message: string,
   mentionedUserIds: string[],
-  parentMessage?: ParentMessage
+  parentMessage?: ParentMessage,
+  file?: FileUploadResult
 ): Promise<any> {
   const filter: SendPayload = { message, mentionedUserIds };
   if (parentMessage) {
     filter.parentMessageId = parentMessage.messageId;
     filter.parentMessageUserId = parentMessage.userId;
   }
+  if (file) {
+    filter.file = file;
+  }
 
   const response = await post<any>(`/chatChannels/${channelId}/message`).send(filter);
 

diff --git a/src/store/messages/saga.ts b/src/store/messages/saga.ts
@@ -49,6 +49,7 @@ export interface SendPayload {
   parentMessage?: ParentMessage;
   parentMessageId?: number;
   parentMessageUserId?: string;
+  file?: FileUploadResult;
 }
 
 export interface MediaPyload {
@@ -244,6 +245,15 @@ export function* uploadFileMessage(action) {
     messages.push(messagesResponse);
   }
 
+  for (const file of media.filter((i) => i.giphy)) {
+    const original = file.giphy.images.original;
+    const giphyFile = { url: original.url, name: file.name, type: file.giphy.type };
+    const messagesResponse = yield call(sendMessagesByChannelId, channelId, undefined, undefined, undefined, giphyFile);
+
+    if (messagesResponse.status !== 200) return;
+    messages.push(messagesResponse.body);
+  }
+
   yield put(
     receive({
       id: channelId,