Merge pull request #62 from ulu-telegram/master

deploy
ulu-telegram · Nov 10, 2023 · 32eed8c · 32eed8c
2 parents 18ac4b6 + 73a1f03
commit 32eed8c
Show file tree

Hide file tree

Showing 31 changed files with 251 additions and 145 deletions.
diff --git a/.patch-version b/.patch-version
@@ -1 +1 @@
-17
+18
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "telegram-t",
-  "version": "10.0.17",
+  "version": "10.0.18",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/public/version.txt b/public/version.txt
@@ -1 +1 @@
-10.0.17
+10.0.18
diff --git a/src/components/common/Composer.tsx b/src/components/common/Composer.tsx
@@ -98,6 +98,7 @@ import buildAttachment, { prepareAttachmentsToSend } from '../middle/composer/he
 import { escapeHtml } from '../middle/composer/helpers/cleanHtml';
 import { buildCustomEmojiHtml } from '../middle/composer/helpers/customEmoji';
 import { isSelectionInsideInput } from '../middle/composer/helpers/selection';
+import { getPeerColorClass } from './helpers/peerColor';
 import renderText from './helpers/renderText';
 import { getTextWithEntitiesAsHtml } from './helpers/renderTextWithEntities';
 
@@ -169,12 +170,12 @@ type OwnProps = {
   dropAreaState?: string;
   isReady: boolean;
   isMobile?: boolean;
-  onDropHide?: NoneToVoidFunction;
   inputId: string;
   editableInputCssSelector: string;
   editableInputId: string;
   className?: string;
   inputPlaceholder?: string;
+  onDropHide?: NoneToVoidFunction;
   onForward?: NoneToVoidFunction;
   onFocus?: NoneToVoidFunction;
   onBlur?: NoneToVoidFunction;
@@ -205,6 +206,7 @@ type StateProps =
     customEmojiForEmoji?: ApiSticker[];
     groupChatMembers?: ApiChatMember[];
     currentUserId?: string;
+    currentUser?: ApiUser;
     recentEmojis: string[];
     contentToBeScheduled?: TabState['contentToBeScheduled'];
     shouldSuggestStickers?: boolean;
@@ -304,6 +306,7 @@ const Composer: FC<OwnProps & StateProps> = ({
   groupChatMembers,
   topInlineBotIds,
   currentUserId,
+  currentUser,
   captionLimit,
   contentToBeScheduled,
   shouldSuggestStickers,
@@ -1609,7 +1612,7 @@ const Composer: FC<OwnProps & StateProps> = ({
             />
           </>
         )}
-        <div className="message-input-wrapper">
+        <div className={buildClassName('message-input-wrapper', getPeerColorClass(currentUser))}>
           {isInMessageList && (
             <>
               {withBotMenuButton && (
@@ -1914,6 +1917,7 @@ export default memo(withGlobal<OwnProps>(
     const botKeyboardMessageId = messageWithActualBotKeyboard ? messageWithActualBotKeyboard.id : undefined;
     const keyboardMessage = botKeyboardMessageId ? selectChatMessage(global, chatId, botKeyboardMessageId) : undefined;
     const { currentUserId } = global;
+    const currentUser = selectUser(global, currentUserId!)!;
     const defaultSendAsId = chatFullInfo ? chatFullInfo?.sendAsId || currentUserId : undefined;
     const sendAsId = chat?.sendAsPeerIds && defaultSendAsId && (
       chat.sendAsPeerIds.some((peer) => peer.id === defaultSendAsId)
@@ -1973,6 +1977,7 @@ export default memo(withGlobal<OwnProps>(
       groupChatMembers: chatFullInfo?.members,
       topInlineBotIds: global.topInlineBots?.userIds,
       currentUserId,
+      currentUser,
       contentToBeScheduled: tabState.contentToBeScheduled,
       shouldSuggestStickers,
       shouldSuggestCustomEmoji,

diff --git a/src/components/common/DeleteMessageModal.tsx b/src/components/common/DeleteMessageModal.tsx
@@ -1,5 +1,7 @@
+/* eslint-disable react/self-closing-comp */
+/* eslint-disable max-len */
 import type { FC } from '../../lib/teact/teact';
-import React, { memo, useCallback } from '../../lib/teact/teact';
+import React, { memo, useCallback, useState } from '../../lib/teact/teact';
 import { getActions, withGlobal } from '../../global';
 
 import type { ApiMessage } from '../../api/types';
@@ -25,6 +27,7 @@ import useLang from '../../hooks/useLang';
 
 import Button from '../ui/Button';
 import Modal from '../ui/Modal';
+import RadioGroup from '../ui/RadioGroup';
 
 export type OwnProps = {
   isOpen: boolean;
@@ -49,8 +52,6 @@ const DeleteMessageModal: FC<OwnProps & StateProps> = ({
   album,
   canDeleteForAll,
   contactName,
-  willDeleteForCurrentUserOnly,
-  willDeleteForAll,
   onConfirm,
   onClose,
 }) => {
@@ -59,57 +60,58 @@ const DeleteMessageModal: FC<OwnProps & StateProps> = ({
     deleteScheduledMessages,
   } = getActions();
 
-  const handleDeleteMessageForAll = useCallback(() => {
-    onConfirm?.();
-    const messageIds = album?.messages
-      ? album.messages.map(({ id }) => id)
-      : [message.id];
-    deleteMessages({ messageIds, shouldDeleteForAll: true });
-    onClose();
-  }, [onConfirm, album, message.id, deleteMessages, onClose]);
+  const [shouldDeleteForAll, setShouldDeleteForAll] = useState(canDeleteForAll ? 'everyone' : 'me');
+  const lang = useLang();
+  const deleteOptions = [
+    {
+      label: lang('ChatList.DeleteForCurrentUser'),
+      value: 'me',
+    },
+    {
+      label: contactName ? renderText(lang('Conversation.DeleteMessagesFor', contactName)) : lang('Conversation.DeleteMessagesForEveryone'),
+      value: 'everyone',
+    },
+  ];
 
-  const handleDeleteMessageForSelf = useCallback(() => {
+  const handleDelete = useCallback(() => {
     onConfirm?.();
-    const messageIds = album?.messages
-      ? album.messages.map(({ id }) => id)
-      : [message.id];
+    const messageIds = album?.messages ? album.messages.map(({ id }) => id) : [message.id];
     if (isSchedule) {
       deleteScheduledMessages({ messageIds });
     } else {
-      deleteMessages({
-        messageIds,
-        shouldDeleteForAll: false,
-      });
+      deleteMessages({ messageIds, shouldDeleteForAll: shouldDeleteForAll === 'everyone' });
     }
     onClose();
-  }, [onConfirm, album, message.id, isSchedule, onClose, deleteScheduledMessages, deleteMessages]);
+  }, [onConfirm, album, message.id, isSchedule, deleteMessages, deleteScheduledMessages, onClose, shouldDeleteForAll]);
 
-  const lang = useLang();
+  const handleRadioChange = useCallback((value: string) => {
+    setShouldDeleteForAll(value);
+  }, []);
 
   return (
     <Modal
       isOpen={isOpen}
       onClose={onClose}
-      onEnter={isOpen && !canDeleteForAll ? handleDeleteMessageForSelf : undefined}
+      onEnter={handleDelete}
       className="delete"
       title={lang('DeleteSingleMessagesTitle')}
     >
       <p>{lang('AreYouSureDeleteSingleMessage')}</p>
-      {willDeleteForCurrentUserOnly && (
-        <p>{lang('lng_delete_for_me_chat_hint', 1, 'i')}</p>
-      )}
-      {willDeleteForAll && (
-        <p>{lang('lng_delete_for_everyone_hint', 1, 'i')}</p>
+      {canDeleteForAll && (
+        <RadioGroup
+          name="deleteFor"
+          options={deleteOptions}
+          selected={shouldDeleteForAll ? 'everyone' : 'me'}
+          // eslint-disable-next-line react/jsx-no-bind
+          onChange={(value) => handleRadioChange(value)}
+        />
       )}
-      <div className={canDeleteForAll ? 'dialog-buttons-column' : 'dialog-buttons'}>
-        {canDeleteForAll && (
-          <Button color="danger" className="confirm-dialog-button" isText onClick={handleDeleteMessageForAll}>
-            {contactName && renderText(lang('Conversation.DeleteMessagesFor', contactName))}
-            {!contactName && lang('Conversation.DeleteMessagesForEveryone')}
-          </Button>
-        )}
-        <Button color="danger" className="confirm-dialog-button" isText onClick={handleDeleteMessageForSelf}>
-          {lang(canDeleteForAll ? 'ChatList.DeleteForCurrentUser' : 'Delete')}
+      <div className="dialog-buttons">
+        <Button color="danger" className="confirm-dialog-button" isText onClick={handleDelete}>
+          {lang('Delete')}
+          <div className="hotkey-frame">
+            <div className="hotkey-icon"></div>
+          </div>
         </Button>
         <Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
       </div>

diff --git a/src/components/common/PinMessageModal.tsx b/src/components/common/PinMessageModal.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable react/self-closing-comp */
 import type { FC } from '../../lib/teact/teact';
-import React, { memo, useCallback } from '../../lib/teact/teact';
+import React, { memo, useCallback, useState } from '../../lib/teact/teact';
 import { getActions, withGlobal } from '../../global';
 
 import {
@@ -17,6 +18,7 @@ import useLang from '../../hooks/useLang';
 
 import Button from '../ui/Button';
 import Modal from '../ui/Modal';
+import RadioGroup from '../ui/RadioGroup';
 
 export type OwnProps = {
   isOpen: boolean;
@@ -47,21 +49,31 @@ const PinMessageModal: FC<OwnProps & StateProps> = ({
 }) => {
   const { pinMessage } = getActions();
 
-  const handlePinMessageForAll = useCallback(() => {
-    pinMessage({
-      messageId, isUnpin: false,
-    });
-    onClose();
-  }, [pinMessage, messageId, onClose]);
+  const [pinForAll, setPinForAll] = useState<string>(canPinForAll ? 'everyone' : 'me');
+
+  const lang = useLang();
 
-  const handlePinMessage = useCallback(() => {
+  const pinOptions = [
+    {
+      label: lang('PinMessageForMe'),
+      value: 'me',
+    },
+    {
+      // eslint-disable-next-line max-len
+      label: contactName ? renderText(lang('Conversation.PinMessagesFor', contactName)) : lang('Conversation.PinMessageAlert.PinAndNotifyMembers'),
+      value: 'everyone',
+    },
+  ];
+
+  const handlePin = useCallback(() => {
     pinMessage({
-      messageId, isUnpin: false, isOneSide: true, isSilent: true,
+      messageId,
+      isUnpin: false,
+      isOneSide: pinForAll === 'me',
+      isSilent: pinForAll === 'me',
     });
     onClose();
-  }, [messageId, onClose, pinMessage]);
-
-  const lang = useLang();
+  }, [pinMessage, messageId, onClose, pinForAll]);
 
   function renderMessage() {
     if (isChannel) {
@@ -75,26 +87,44 @@ const PinMessageModal: FC<OwnProps & StateProps> = ({
     return lang('PinMessageAlertChat');
   }
 
+  const handleRadioChange = (value: string) => {
+    setPinForAll(value);
+  };
+
   return (
     <Modal
       isOpen={isOpen}
       onClose={onClose}
+      onEnter={handlePin}
       className="pin"
       title={lang('PinMessageAlertTitle')}
     >
       <p>{renderMessage()}</p>
-      <div className="dialog-buttons-column">
-        <Button className="confirm-dialog-button" isText onClick={handlePinMessage}>
-          {lang('DialogPin')}
+      <RadioGroup
+        name="pinFor"
+        options={pinOptions}
+        selected={pinForAll}
+        // eslint-disable-next-line react/jsx-no-bind
+        onChange={(value) => handleRadioChange(value)}
+      />
+      <div className="dialog-buttons">
+        <Button
+          color="primary"
+          className="confirm-dialog-button"
+          onClick={handlePin}
+        >
+          {lang('PinMessageAlertTitle')}
+          <div className="hotkey-frame">
+            <div className="hotkey-icon"></div>
+          </div>
+        </Button>
+        <Button
+          className="confirm-dialog-button"
+          isText
+          onClick={onClose}
+        >
+          {lang('Cancel')}
         </Button>
-        {canPinForAll && (
-          <Button className="confirm-dialog-button" isText onClick={handlePinMessageForAll}>
-            {contactName
-              ? renderText(lang('Conversation.PinMessagesFor', contactName))
-              : lang('Conversation.PinMessageAlert.PinAndNotifyMembers')}
-          </Button>
-        )}
-        <Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
       </div>
     </Modal>
   );

diff --git a/src/components/common/ReportModal.tsx b/src/components/common/ReportModal.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/self-closing-comp */
 import type { ChangeEvent } from 'react';
 import type { FC } from '../../lib/teact/teact';
 import React, { memo, useMemo, useState } from '../../lib/teact/teact';
@@ -126,6 +127,9 @@ const ReportModal: FC<OwnProps> = ({
       <div className="dialog-buttons">
         <Button color="danger" className="confirm-dialog-button" isText onClick={handleReport}>
           {lang('lng_report_button')}
+          <div className="hotkey-frame">
+            <div className="hotkey-icon"></div>
+          </div>
         </Button>
         <Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
       </div>

diff --git a/src/components/common/embedded/EmbeddedMessage.scss b/src/components/common/embedded/EmbeddedMessage.scss
@@ -189,8 +189,7 @@
   }
 
   &.inside-input {
-    padding-inline-start: 0.5625rem;
-    width: 100%;
+    flex-grow: 1;
 
     .embedded-thumb {
       margin-left: 0.125rem;

diff --git a/src/components/common/helpers/peerColor.ts b/src/components/common/helpers/peerColor.ts
@@ -5,7 +5,7 @@ import { getPeerColorCount, getPeerColorKey } from '../../../global/helpers';
 export function getPeerColorClass(peer?: ApiPeer, noUserColors?: boolean, shouldReset?: boolean) {
   if (!peer) {
     if (!shouldReset) return undefined;
-    return noUserColors ? 'peer-color-count-0' : 'peer-color-0';
+    return noUserColors ? 'peer-color-count-1' : 'peer-color-0';
   }
   return noUserColors ? `peer-color-count-${getPeerColorCount(peer)}` : `peer-color-${getPeerColorKey(peer)}`;
 }
diff --git a/src/components/common/helpers/renderTextWithEntities.tsx b/src/components/common/helpers/renderTextWithEntities.tsx
@@ -392,11 +392,9 @@ function processEntity({
       return <strong data-entity-type={entity.type}>{renderNestedMessagePart()}</strong>;
     case ApiMessageEntityTypes.Blockquote:
       return (
-        <div className="message-entity-blockquote-wrapper">
-          <blockquote data-entity-type={entity.type}>
-            {renderNestedMessagePart()}
-          </blockquote>
-        </div>
+        <blockquote data-entity-type={entity.type}>
+          {renderNestedMessagePart()}
+        </blockquote>
       );
     case ApiMessageEntityTypes.BotCommand:
       return (
@@ -574,6 +572,11 @@ function processEntityAsHtml(
         >${renderedContent}</span>`;
     case ApiMessageEntityTypes.CustomEmoji:
       return buildCustomEmojiHtmlFromEntity(rawEntityText, entity);
+    case ApiMessageEntityTypes.Blockquote:
+      return `<span
+        class="blockquote"
+        data-entity-type="${ApiMessageEntityTypes.Blockquote}"
+        >${renderedContent}</span>`;
     default:
       return renderedContent;
   }