Paid Messages: Follow up (#5790)

Author: Ajaxy

src/api/gramjs/apiBuilders/calls.ts

@@ -9,7 +9,7 @@ import type {
 } from '../../../lib/secret-sauce';
 import type { ApiGroupCall, ApiPhoneCall } from '../../types';
 
-import { getApiChatIdFromMtpPeer, isPeerUser } from './peers';
+import { getApiChatIdFromMtpPeer, isMtpPeerUser } from './peers';
 
 export function buildApiGroupCallParticipant(participant: GramJs.GroupCallParticipant): GroupCallParticipant {
   const {
@@ -33,7 +33,7 @@ export function buildApiGroupCallParticipant(participant: GramJs.GroupCallPartic
     raiseHandRating: raiseHandRating?.toString(),
     volume,
     date: new Date(date),
-    isUser: isPeerUser(peer),
+    isUser: isMtpPeerUser(peer),
     id: getApiChatIdFromMtpPeer(peer),
     video: video ? buildApiGroupCallParticipantVideo(video) : undefined,
     presentation: presentation ? buildApiGroupCallParticipantVideo(presentation) : undefined,

src/api/gramjs/apiBuilders/chats.ts

@@ -36,8 +36,8 @@ import {
   buildApiPeerColor,
   buildApiPeerId,
   getApiChatIdFromMtpPeer,
-  isPeerChat,
-  isPeerUser,
+  isMtpPeerChat,
+  isMtpPeerUser,
 } from './peers';
 import { buildApiReaction } from './reactions';
 
@@ -295,17 +295,17 @@ export function getApiChatTypeFromPeerEntity(peerEntity: GramJs.TypeChat | GramJ
 }
 
 export function getPeerKey(peer: GramJs.TypePeer) {
-  if (isPeerUser(peer)) {
+  if (isMtpPeerUser(peer)) {
     return `user${peer.userId}`;
-  } else if (isPeerChat(peer)) {
+  } else if (isMtpPeerChat(peer)) {
     return `chat${peer.chatId}`;
   } else {
     return `chat${peer.channelId}`;
   }
 }
 
 export function getApiChatTitleFromMtpPeer(peer: GramJs.TypePeer, peerEntity: GramJs.User | GramJs.Chat) {
-  if (isPeerUser(peer)) {
+  if (isMtpPeerUser(peer)) {
     return getUserName(peerEntity as GramJs.User);
   } else {
     return (peerEntity as GramJs.Chat).title;

src/api/gramjs/apiBuilders/peers.ts

@@ -6,15 +6,15 @@ import type { ApiEmojiStatusType, ApiPeerColor } from '../../types';
 import { CHANNEL_ID_LENGTH } from '../../../config';
 import { numberToHexColor } from '../../../util/colors';
 
-export function isPeerUser(peer: GramJs.TypePeer | GramJs.TypeInputPeer): peer is GramJs.PeerUser {
+export function isMtpPeerUser(peer: GramJs.TypePeer | GramJs.TypeInputPeer): peer is GramJs.PeerUser {
   return peer.hasOwnProperty('userId');
 }
 
-export function isPeerChat(peer: GramJs.TypePeer | GramJs.TypeInputPeer): peer is GramJs.PeerChat {
+export function isMtpPeerChat(peer: GramJs.TypePeer | GramJs.TypeInputPeer): peer is GramJs.PeerChat {
   return peer.hasOwnProperty('chatId');
 }
 
-export function isPeerChannel(peer: GramJs.TypePeer | GramJs.TypeInputPeer): peer is GramJs.PeerChannel {
+export function isMtpPeerChannel(peer: GramJs.TypePeer | GramJs.TypeInputPeer): peer is GramJs.PeerChannel {
   return peer.hasOwnProperty('channelId');
 }
 
@@ -34,9 +34,9 @@ export function buildApiPeerId(id: BigInt.BigInteger, type: 'user' | 'chat' | 'c
 }
 
 export function getApiChatIdFromMtpPeer(peer: GramJs.TypePeer | GramJs.TypeInputPeer) {
-  if (isPeerUser(peer)) {
+  if (isMtpPeerUser(peer)) {
     return buildApiPeerId(peer.userId, 'user');
-  } else if (isPeerChat(peer)) {
+  } else if (isMtpPeerChat(peer)) {
     return buildApiPeerId(peer.chatId, 'chat');
   } else {
     return buildApiPeerId((peer as GramJs.InputPeerChannel).channelId, 'channel');

src/api/gramjs/methods/users.ts

@@ -258,6 +258,17 @@ export async function addNoPaidMessagesException({ user, shouldRefundCharged }:
   return result;
 }
 
+export async function fetchPaidMessagesRevenue({ user }: {
+  user: ApiUser;
+  shouldRefundCharged?: boolean;
+}) {
+  const result = await invokeRequest(new GramJs.account.GetPaidMessagesRevenue({
+    userId: buildInputEntity(user.id, user.accessHash) as GramJs.InputUser,
+  }));
+  if (!result) return undefined;
+  return result.starsAmount.toJSNumber();
+}
+
 export async function fetchProfilePhotos({
   peer,
   offset = 0,

src/assets/localization/fallback.strings

@@ -1890,4 +1890,7 @@
 "PaidMessageTransaction_one" = "Fee for {count} Message";
 "PaidMessageTransaction_other" = "Fee for {count} Messages";
 "PaidMessageTransactionDescription" = "You receive **{percent}** of the price that you charge for each incoming message.";
-"PaidMessageTransactionTotal" = "Total";
+"PaidMessageTransactionTotal" = "Total";
+"DescriptionRestrictedMedia" = "Posting media content is not allowed in this group.";
+"DescriptionScheduledPaidMediaNotAllowed" = "Posting scheduled paid media content is not allowed";
+"DescriptionScheduledPaidMessagesNotAllowed" = "Scheduled paid messages is not allowed";

src/bundles/stars.ts

@@ -12,3 +12,4 @@ export { default as GiftUpgradeModal } from '../components/modals/gift/upgrade/G
 export { default as GiftStatusInfoModal } from '../components/modals/gift/status/GiftStatusInfoModal';
 export { default as GiftWithdrawModal } from '../components/modals/gift/withdraw/GiftWithdrawModal';
 export { default as GiftTransferModal } from '../components/modals/gift/transfer/GiftTransferModal';
+export { default as ChatRefundModal } from '../components/modals/stars/chatRefund/ChatRefundModal';

src/components/common/Avatar.tsx

@@ -21,10 +21,9 @@ import {
   isAnonymousForwardsChat,
   isChatWithRepliesBot,
   isDeletedUser,
-  isPeerChat,
-  isPeerUser,
   isUserId,
 } from '../../global/helpers';
+import { isApiPeerChat, isApiPeerUser } from '../../global/helpers/peers';
 import buildClassName, { createClassNameBuilder } from '../../util/buildClassName';
 import buildStyle from '../../util/buildStyle';
 import { getFirstLetters } from '../../util/textFormat';
@@ -117,8 +116,8 @@ const Avatar: FC<OwnProps> = ({
   const videoLoopCountRef = useRef(0);
   const isCustomPeer = peer && 'isCustomPeer' in peer;
   const realPeer = peer && !isCustomPeer ? peer : undefined;
-  const user = realPeer && isPeerUser(realPeer) ? realPeer : undefined;
-  const chat = realPeer && isPeerChat(realPeer) ? realPeer : undefined;
+  const user = realPeer && isApiPeerUser(realPeer) ? realPeer : undefined;
+  const chat = realPeer && isApiPeerChat(realPeer) ? realPeer : undefined;
   const isDeleted = user && isDeletedUser(user);
   const isReplies = realPeer && isChatWithRepliesBot(realPeer.id);
   const isAnonymousForwards = realPeer && isAnonymousForwardsChat(realPeer.id);

src/components/common/Composer.tsx

@@ -57,7 +57,6 @@ import { requestMeasure, requestNextMutation } from '../../lib/fasterdom/fasterd
 import {
   canEditMedia,
   getAllowedAttachmentOptions,
-  getPeerTitle,
   getReactionKey,
   getStoryKey,
   isChatAdmin,
@@ -68,6 +67,7 @@ import {
   isUserId,
 } from '../../global/helpers';
 import { getChatNotifySettings } from '../../global/helpers/notifications';
+import { getPeerTitle } from '../../global/helpers/peers';
 import {
   selectBot,
   selectCanPlayAnimatedEmojis,
@@ -288,6 +288,8 @@ type StateProps =
     shouldPaidMessageAutoApprove?: boolean;
     isSilentPosting?: boolean;
     isPaymentMessageConfirmDialogOpen: boolean;
+    starsBalance: number;
+    isStarsBalanceModalOpen: boolean;
   };
 
 enum MainButtonState {
@@ -406,6 +408,8 @@ const Composer: FC<OwnProps & StateProps> = ({
   onBlur,
   onForward,
   isPaymentMessageConfirmDialogOpen,
+  starsBalance,
+  isStarsBalanceModalOpen,
 }) => {
   const {
     sendMessage,
@@ -520,8 +524,13 @@ const Composer: FC<OwnProps & StateProps> = ({
     canSendStickers, canSendGifs, canAttachMedia, canAttachPolls, canAttachEmbedLinks,
     canSendVoices, canSendPlainText, canSendAudios, canSendVideos, canSendPhotos, canSendDocuments,
   } = useMemo(
-    () => getAllowedAttachmentOptions(chat, chatFullInfo, isChatWithBot, isInStoryViewer),
-    [chat, chatFullInfo, isChatWithBot, isInStoryViewer],
+    () => getAllowedAttachmentOptions(chat,
+      chatFullInfo,
+      isChatWithBot,
+      isInStoryViewer,
+      paidMessagesStars,
+      isInScheduledList),
+    [chat, chatFullInfo, isChatWithBot, isInStoryViewer, paidMessagesStars, isInScheduledList],
   );
 
   const isNeedPremium = isContactRequirePremium && isInStoryViewer;
@@ -541,7 +550,7 @@ const Composer: FC<OwnProps & StateProps> = ({
     shouldAutoApprove: shouldPaidMessageAutoApprove,
     setAutoApprove: setShouldPaidMessageAutoApprove,
     handleWithConfirmation: handleActionWithPaymentConfirmation,
-  } = usePaidMessageConfirmation(starsForAllMessages);
+  } = usePaidMessageConfirmation(starsForAllMessages, isStarsBalanceModalOpen, starsBalance);
 
   const hasWebPagePreview = !hasAttachments && canAttachEmbedLinks && !noWebPage && Boolean(webPagePreview);
   const isComposerBlocked = isSendTextBlocked && !editingMessage;
@@ -1391,19 +1400,23 @@ const Composer: FC<OwnProps & StateProps> = ({
 
     if (isInScheduledList) {
       requestCalendar((scheduledAt) => {
-        handleMessageSchedule({ poll }, scheduledAt, currentMessageList);
+        handleActionWithPaymentConfirmation(
+          handleMessageSchedule,
+          { poll },
+          scheduledAt,
+          currentMessageList,
+        );
       });
       closePollModal();
     } else {
-      sendMessage({ messageList: currentMessageList, poll, isSilent: isSilentPosting });
+      handleActionWithPaymentConfirmation(
+        sendMessage,
+        { messageList: currentMessageList, poll, isSilent: isSilentPosting },
+      );
       closePollModal();
     }
   });
 
-  const handlePollSendWithPaymentConfirmation = useLastCallback((poll: ApiNewPoll) => {
-    handleActionWithPaymentConfirmation(handlePollSend, poll);
-  });
-
   const sendSilent = useLastCallback((additionalArgs?: ScheduledMessageArgs) => {
     if (isInScheduledList) {
       requestCalendar((scheduledAt) => {
@@ -1587,7 +1600,7 @@ const Composer: FC<OwnProps & StateProps> = ({
               message: oldLang('VoiceMessagesRestrictedByPrivacy', chat?.title),
             });
           } else if (!canSendVoices) {
-            showAllowedMessageTypesNotification({ chatId });
+            showAllowedMessageTypesNotification({ chatId, messageListType });
           }
         } else {
           setIsViewOnceEnabled(false);
@@ -1812,7 +1825,7 @@ const Composer: FC<OwnProps & StateProps> = ({
         isQuiz={pollModal.isQuiz}
         shouldBeAnonymous={isChannel}
         onClear={closePollModal}
-        onSend={handlePollSendWithPaymentConfirmation}
+        onSend={handlePollSend}
       />
       <SendAsMenu
         isOpen={isSendAsMenuOpen}
@@ -1998,6 +2011,7 @@ const Composer: FC<OwnProps & StateProps> = ({
             onFocus={markInputHasFocus}
             onBlur={unmarkInputHasFocus}
             isNeedPremium={isNeedPremium}
+            messageListType={messageListType}
           />
           {isInMessageList && (
             <>
@@ -2084,6 +2098,8 @@ const Composer: FC<OwnProps & StateProps> = ({
               theme={theme}
               onMenuOpen={onAttachMenuOpen}
               onMenuClose={onAttachMenuClose}
+              messageListType={messageListType}
+              paidMessagesStars={paidMessagesStars}
             />
           )}
           {isInMessageList && Boolean(botKeyboardMessageId) && (
@@ -2354,6 +2370,8 @@ export default memo(withGlobal<OwnProps>(
 
     const maxMessageLength = global.config?.maxMessageLength || DEFAULT_MAX_MESSAGE_LENGTH;
     const isForwarding = chatId === tabState.forwardMessages.toChatId;
+    const starsBalance = global.stars?.balance.amount || 0;
+    const isStarsBalanceModalOpen = Boolean(tabState.starsBalanceModal);
 
     return {
       availableReactions: global.reactions.availableReactions,
@@ -2436,6 +2454,8 @@ export default memo(withGlobal<OwnProps>(
       shouldPaidMessageAutoApprove,
       isSilentPosting,
       isPaymentMessageConfirmDialogOpen: tabState.isPaymentMessageConfirmDialogOpen,
+      starsBalance,
+      isStarsBalanceModalOpen,
     };
   },
 )(Composer));

src/components/common/DeleteMessageModal.tsx

@@ -12,14 +12,14 @@ import type { IRadioOption } from '../ui/CheckboxGroup';
 
 import {
   getHasAdminRight,
-  getPeerTitle,
   getPrivateChatUserId,
   getUserFirstOrLastName, isChatBasicGroup,
   isChatChannel,
   isChatSuperGroup,
   isSystemBot,
   isUserId,
 } from '../../global/helpers';
+import { getPeerTitle } from '../../global/helpers/peers';
 import {
   getSendersFromSelectedMessages,
   selectBot,

src/components/common/FullNameTitle.tsx

@@ -15,8 +15,8 @@ import {
   isAnonymousForwardsChat,
   isChatWithRepliesBot,
   isChatWithVerificationCodesBot,
-  isPeerUser,
 } from '../../global/helpers';
+import { isApiPeerUser } from '../../global/helpers/peers';
 import buildClassName from '../../util/buildClassName';
 import buildStyle from '../../util/buildStyle';
 import { copyTextToClipboard } from '../../util/clipboard';
@@ -71,7 +71,7 @@ const FullNameTitle: FC<OwnProps> = ({
   const { showNotification } = getActions();
   const realPeer = 'id' in peer ? peer : undefined;
   const customPeer = 'isCustomPeer' in peer ? peer : undefined;
-  const isUser = realPeer && isPeerUser(realPeer);
+  const isUser = realPeer && isApiPeerUser(realPeer);
   const title = realPeer && (isUser ? getUserFullName(realPeer) : getChatTitle(lang, realPeer));
   const isPremium = isUser && realPeer.isPremium;
   const canShowEmojiStatus = withEmojiStatus && !isSavedMessages && realPeer;