diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..6669542f6
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,399 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+# Instructions
+
+You are an expert in TypeScript, JavaScript, HTML, SCSS and Teact with deep experience in our project's simplified React-like API. You are working on a modern web app for Telegram.
+
+- **Be concise.** Only change code directly related to the current task; leave unrelated parts untouched.
+- **Reuse** existing types, functions and components. Search before creating a new one.
+- **No new libraries.** Use existing dependencies only. If a task truly can't be done without a new library, stop and explain why.
+- **Do not** write tests.
+
+- **SCSS modules:**
+ - Name classes in camelCase.
+ - Import as `styles` in your component:
+ ```scss
+ /* Component.module.scss */
+ .myWrapper { /*…*/ }
+ ```
+ ```tsx
+ /* Component.tsx */
+ import styles from "./Component.module.scss";
+
+ ```
+ - Use [buildClassName.ts](mdc:src/util/buildClassName.ts) to merge multiple class names.
+ - **Always extract styles to files** - avoid inline styles unless absolutely necessary.
+ - **If file already imports styles**, check where they come from and add new styles there - don't create new style files.
+ - Use rem units for all measurements.
+
+- **Code Style:**
+ - Early returns.
+ - Prefix boolean variables with primary or modal auxiliaries (e.q. `isOpen`, `willUpdate`, `shouldRender`).
+ - Functions should start with a verb (e.q. `openModal`, `closeDialog`, `handleClick`).
+ - Prefer checking required parameter before calling a function, avoid making it optinal and checking at the beginning of the function.
+ - Only leave comments for complex logic.
+ - **IMPORTANT: Avoid conditional spread operators** - TypeScript doesn't check if spread fields match the target type.
+ ```typescript
+ // ❌ BAD - No type checking
+ { ...condition && { field: value } }
+
+ // ✅ GOOD - Full type checking
+ { field: condition ? value : undefined }
+ ```
+
+- **Localization & Text Rules:**
+ - **ALWAYS** use `lang()` for all text content - never hardcode strings.
+ - `lang()` can accept parameters: `lang('Key', { param: value })`.
+ - Add new translations to end of `src/assets/localization/fallback.strings`.
+
+- **After your solution:**
+ 1. Critique it—identify any shortcomings.
+ 2. Fix those issues, do more planning.
+ 3. Present the improved result.
+
+- **When deeper debugging is needed:**
+ 1. Outline clear, step-by-step debugging instructions for the operator.
+ 2. Remove any temporary debug code once the issue is resolved.
+
+- **Lint errors you can't fix manually:**
+ Suggest running `eslint --fix `.
+
+# Telegram Web API Guide
+
+## 1. API Definition
+- The master file is `src/lib/gramjs/tl/static/api.tl` (TL syntax).
+- **Don't edit** this autogenerated file. TypeScript types live in `api.d.ts`.
+- We use GramJS inside a web worker; UI code uses plain objects (`Api*` types) in `src/api/types`.
+
+## 2. Generating Code
+1. Make sure to include the method name in `api.json`.
+2. Run:
+```bash
+ npm run gramjs:tl
+```
+to regenerate `api.d.ts`.
+3. In `src/api/gramjs/methods/`, pick a file for your method, then:
+* Name fetchers `fetch*` if the TL method starts with `get`.
+* Use a destructured parameter object.
+* Call the API via:
+ ```ts
+ const result = await invokeRequest(
+ new GramJs.namespace.MethodName({ /* params */ })
+ );
+ ```
+* If `result` is `undefined`, return `undefined` to signal an error.
+* Convert any returned GramJS classes into plain `Api*` objects.
+
+Convesion from and to Api* objects is done by `apiBuilders` (function name starts with `buildApi*`) and `gramjsBuilders` (function name `buildInput*`).
+
+## 3. Using the API
+
+* In your actions, call:
+
+ ```ts
+ const result = await callApi('methodName', { /* params */ });
+ ```
+* Always check for `undefined` before proceeding.
+
+## 4. Example
+
+```ts
+// src/api/gramjs/methods/users.ts
+export async function fetchUsers({ users }: { users: ApiUser[] }) {
+ const result = await invokeRequest(new GramJs.users.GetUsers({
+ id: users.map(({ id, accessHash }) => buildInputUser(id, accessHash)),
+ }));
+ if (!result || !result.length) {
+ return undefined;
+ }
+
+ const apiUsers = result.map(buildApiUser).filter(Boolean);
+ const userStatusesById = buildApiUserStatuses(result);
+
+ return {
+ users: apiUsers,
+ userStatusesById,
+ };
+}
+
+// src/global/actions/api/users.ts
+addActionHandler('loadUser', async (global, actions, { userId }) => {
+ const user = selectUser(global, userId);
+ if (!user) return;
+ const res = await callApi('fetchUsers', { users: [user] });
+ if (!res) return;
+ // update global state...
+});
+```
+
+## 5. Handling Updates
+
+* Updates come in via `mtpUpdateHandler.ts`.
+* They're routed through `src/global/actions/apiUpdaters` to merge into global state.
+* Types are defined in `src/api/types/updates.ts`.
+
+## Component Style Guide
+
+### 1. Basics & Imports
+
+* All components use JSX and render with Teact.
+* **Always** import React from teact library, for JSX compatibility reasons. Only import from `'react'` when you need React **types** that are not provided in Teact.
+* Built-in hooks live in `src/lib/teact/teact`. Import them from there.
+
+### 2. Props & Types
+
+* Split your props into two types:
+ * **OwnProps**: data passed in by the parent
+ * **StateProps**: data injected by `withGlobal` HOC
+* Merge them as `OwnProps & StateProps` when defining your component.
+* You can skip one or both if they are not used.
+* **Order rule**: list any function types *last* in your props definitions.
+
+### 3. Hooks
+* **useLastCallback** is your go-to for callbacks, since it won't trigger re-renders and always uses the latest scope.
+* Only use **useCallback** when you really need to memoize a render function.
+* Prefer **useFlag()** over `useState()` for simple boolean toggles.
+* Check the `hooks/` folders for additional utilities.
+
+### 4. Component Signature
+> **Migrate** any old `FC` syntax to the new form.
+
+```ts
+// Before
+const OldComp: FC = ({ … }) => { … }
+
+// After
+const NewComp = (props: OwnProps & StateProps) => { … }
+```
+
+### 5. Memoization
+* Wrap most components with `memo()` to avoid unnecessary updates.
+* Don't pass freshly created objects or arrays as props to memoized components.
+* **Exceptions** (no memo): `ListItem`, `Button`, `MenuItem`, etc.
+
+### 6. Localization
+
+* Call `const lang = useLang()` at the top of your component.
+* Look up the localization guide for how to add new language keys.
+
+---
+
+### Example
+
+```ts
+import React, { useFlag } from '../../lib/teact/teact';
+
+import useLang from '../../hooks/useLang';
+import useLastCallback from '../../hooks/useLastCallback';
+
+import styles from './Component.module.scss';
+
+type OwnProps = {
+ id: string;
+ className?: string;
+ onClick?: NoneToVoidFunction;
+};
+
+type StateProps = {
+ stateValue?: string;
+};
+
+// Constants first
+const MAX_ITEMS = 10
+
+const Component = ({ id, className, stateValue, onClick }: OwnProps & StateProps) => {
+ const { someAction } = getActions(); // Should always be first, if actions are used
+
+ const ref = useRef(null);
+
+ const [color, setColor] = useState('#FF00FF');
+ const [isOpen, open, close] = useFlag();
+
+ const lang = useLang();
+
+ const handleClick = useLastCallback(() => {
+ if (!ref.current) return;
+ const el = ref.current;
+ setColor(el.value);
+ close();
+ onClick?.();
+ someAction(el.value);
+ });
+
+ return (
+
+
+
{stateValue}
+
+ );
+}
+
+export default memo(withGlobal((global, { id }): StateProps => {
+
+ const stateValue = selectValue(global, id);
+ return {
+ stateValue,
+ };
+ })(Component);
+)
+```
+
+## Global State Overview
+
+Global State is our single, app-wide store, similar to Redux or Zustand. All its code lives under `src/global/`, with subfolders grouping related functionality (for example, `selectors/users.ts` holds all user-related selectors).
+
+### 1. Folder Structure
+
+* **`actions/`**: Actions that are used to update global from any point in the app
+* **`selectors/`**: Pure functions that read data (e.g. `selectors/users.ts`).
+* **`reducers/`**: Functions that update global state.
+* **`types/`**: All TypeScript types live in `src/global/types`.
+* **`cache.ts`**: Manages saving a slimmed-down copy of global to IndexedDB.
+
+### 2. Actions
+
+1. **Preffered** way to update global. When inside action, use `setGlobal`, or simple `return` if sync.
+2. **Sync actions** return type should be `ActionReturnType`.
+3. **Async actions** return type should be `Promise`.
+4. If you add or remove an action, update `actions.ts` accordingly.
+5. Actions in `ui` folder should be only sync.
+
+### 3. Multi-Tab Support
+
+* Actions and selectors can accept a `tabId` parameter, so we don't lose tab context when working with multiple tabs.
+* **`tabId` is required** if calling an action or selector that can accept it.
+* **Exception**: UI components may call without `tabId` (they receive it automatically).
+
+### 4. Selectors & Reducers
+
+* If logic takes more than one line, create a new selector or reducer in the appropriate folder and file.
+* **Selectors must be pure**: only use their inputs and global. Don't allocate new objects or arrays, as that breaks memoization.
+
+### 5. Data Constraints
+
+* Global may only store serializable primitives (strings, numbers, booleans).
+* When you change a type that's cached in `cache.ts`, add a migration to avoid errors from new selectors.
+
+---
+
+## Component Guidelines
+
+### 1. Accessing Global in Components
+
+* **Use** `withGlobal` (a `mapStateToProps` helper) to pull in state.
+* **Avoid** the experimental `useSelector` API.
+* **Use** `getGlobal` **only** inside hooks for one-off reads (it's non-reactive).
+
+### 2. Performance
+
+* Wrap `withGlobal` in `memo` so the component re-renders only on real data changes.
+* **Don't** return new arrays or objects inside `withGlobal`; that defeats memoization.
+* If you need to filter or map a list, **pass IDs as props** and do the heavy work in a `useMemo` hook.
+
+### 3. Example Component
+
+```ts
+type OwnProps = { id: string };
+type StateProps = {
+ someValue?: string;
+ otherValue?: number;
+ thirdValue: boolean;
+};
+
+const Component = ({
+ id,
+ someValue,
+ otherValue,
+ thirdValue,
+}: OwnProps & StateProps) => {
+ // component logic...
+};
+
+export default memo(
+ withGlobal((global, { id }) => {
+ const { otherValue } = selectTabState(global);
+ const someValue = selectSomeValue(global, id);
+ const thirdValue = Boolean(global.rawValue);
+
+ return {
+ someValue,
+ otherValue,
+ thirdValue,
+ };
+ })(Component);
+);
+```
+
+# Localization Guide
+
+**1. Setup & Fallback**
+
+* Translations live on [Translation Platform](https://translations.telegram.org/).
+* Fallback file: `src/assets/localization/fallback.strings`.
+
+**2. Getting Strings**
+
+```ts
+const lang = useLang();
+
+// Simple
+lang('SimpleKey');
+
+// Plurals
+lang('PluralKey', undefined, { pluralValue: 3 });
+
+// String replacements
+lang('ReplKey', { name: 'Amy' });
+
+// JSX nodes (e.g. links)
+lang('LinkKey', { link: }, { withNodes: true });
+
+// Markdown
+lang('MarkdownKey', undefined, { withNodes: true, withMarkdown: true });
+```
+
+**3. Adding a New Key**
+
+1. Search Translation Platform for similar strings to get the correct wording.
+2. Add it to `fallback.strings`.
+3. If it's plural, include `_one` and `_other`.
+4. Run `npm run lang:ts`.
+
+**4. Naming Rules**
+
+* **PascalCase** (no dots).
+* Use short, clear prefixes for context (e.g. `Acc` for accessibility).
+* Keep names under ~30 chars, shorten consistently if needed.
+
+**5. API & Options**
+
+* **Basic**: `lang(key, vars?, options?) → string`
+
+* **Advanced** (`withNodes`): returns `TeactNode[]` so you can inject JSX.
+
+* **Other options**:
+
+ * `withMarkdown` (for simple markdown + emojis)
+ * `renderTextFilters` (custom filters)
+ * `specialReplacement` (for replacing substrings, e.g. icons)
+
+* **Object syntax**:
+ Simple form that returns string can be used in some actions.
+ ```ts
+ actions.showNotification({ key: 'LangKey' });
+
+ lang.with({ key: 'hello', vars: { name }, options: { withNodes: true } });
+ ```
+
+**6. Handy Extensions**
+
+* `lang.region(code)` → country name
+* `lang.conjunction(['a','b','c'])` → "a, b, and c"
+* `lang.disjunction(['x','y'])` → "x or y"
+* `lang.number(1234)` → locale-formatted number
+* Flags: `lang.isRtl`, `lang.code`, `lang.rawCode`
+
+**7. Beyond React**
+Use `getTranslationFn()` to grab the same `lang` function in non-component code. Discouraged, use object syntax.
\ No newline at end of file
diff --git a/src/api/gramjs/apiBuilders/appConfig.ts b/src/api/gramjs/apiBuilders/appConfig.ts
index 9c049bd42..158ad2a0c 100644
--- a/src/api/gramjs/apiBuilders/appConfig.ts
+++ b/src/api/gramjs/apiBuilders/appConfig.ts
@@ -101,6 +101,13 @@ export interface GramJsAppConfig extends LimitsConfig {
stars_stargift_resale_amount_max?: number;
stars_stargift_resale_amount_min?: number;
stars_stargift_resale_commission_permille?: number;
+ stars_suggested_post_amount_max?: number;
+ stars_suggested_post_amount_min?: number;
+ stars_suggested_post_commission_permille?: number;
+ stars_suggested_post_age_min?: number;
+ stars_suggested_post_future_max?: number;
+ stars_suggested_post_future_min?: number;
+ ton_suggested_post_commission_permille?: number;
poll_answers_max?: number;
todo_items_max?: number;
todo_title_length_max?: number;
@@ -205,6 +212,13 @@ export function buildAppConfig(json: GramJs.TypeJSONValue, hash: number): ApiApp
starsStargiftResaleAmountMin: appConfig.stars_stargift_resale_amount_min,
starsStargiftResaleAmountMax: appConfig.stars_stargift_resale_amount_max,
starsStargiftResaleCommissionPermille: appConfig.stars_stargift_resale_commission_permille,
+ starsSuggestedPostAmountMax: appConfig.stars_suggested_post_amount_max,
+ starsSuggestedPostAmountMin: appConfig.stars_suggested_post_amount_min,
+ starsSuggestedPostCommissionPermille: appConfig.stars_suggested_post_commission_permille,
+ starsSuggestedPostAgeMin: appConfig.stars_suggested_post_age_min,
+ starsSuggestedPostFutureMax: appConfig.stars_suggested_post_future_max,
+ starsSuggestedPostFutureMin: appConfig.stars_suggested_post_future_min,
+ tonSuggestedPostCommissionPermille: appConfig.ton_suggested_post_commission_permille,
pollMaxAnswers: appConfig.poll_answers_max,
todoItemsMax: appConfig.todo_items_max ?? TODO_ITEMS_LIMIT,
todoTitleLengthMax: appConfig.todo_title_length_max ?? TODO_TITLE_LENGTH_LIMIT,
diff --git a/src/api/gramjs/apiBuilders/gifts.ts b/src/api/gramjs/apiBuilders/gifts.ts
index 57274a8af..35ddb8106 100644
--- a/src/api/gramjs/apiBuilders/gifts.ts
+++ b/src/api/gramjs/apiBuilders/gifts.ts
@@ -24,7 +24,7 @@ export function buildApiStarGift(starGift: GramJs.TypeStarGift): ApiStarGift {
if (starGift instanceof GramJs.StarGiftUnique) {
const {
id, num, ownerId, ownerName, title, attributes, availabilityIssued, availabilityTotal, slug, ownerAddress,
- giftAddress, resellStars,
+ giftAddress, resellStars, releasedBy,
} = starGift;
return {
@@ -41,12 +41,13 @@ export function buildApiStarGift(starGift: GramJs.TypeStarGift): ApiStarGift {
slug,
giftAddress,
resellPriceInStars: resellStars?.toJSNumber(),
+ releasedByPeerId: releasedBy && getApiChatIdFromMtpPeer(releasedBy),
};
}
const {
id, limited, stars, availabilityRemains, availabilityTotal, convertStars, firstSaleDate, lastSaleDate, soldOut,
- birthday, upgradeStars, resellMinStars, title, availabilityResale,
+ birthday, upgradeStars, resellMinStars, title, availabilityResale, releasedBy,
} = starGift;
addDocumentToLocalDb(starGift.sticker);
@@ -69,6 +70,7 @@ export function buildApiStarGift(starGift: GramJs.TypeStarGift): ApiStarGift {
upgradeStars: upgradeStars?.toJSNumber(),
title,
resellMinStars: resellMinStars?.toJSNumber(),
+ releasedByPeerId: releasedBy && getApiChatIdFromMtpPeer(releasedBy),
availabilityResale: availabilityResale?.toJSNumber(),
};
}
diff --git a/src/api/gramjs/apiBuilders/messageActions.ts b/src/api/gramjs/apiBuilders/messageActions.ts
index bea31f515..d91fc535c 100644
--- a/src/api/gramjs/apiBuilders/messageActions.ts
+++ b/src/api/gramjs/apiBuilders/messageActions.ts
@@ -7,6 +7,7 @@ import { buildApiBotApp } from './bots';
import { buildApiFormattedText, buildApiPhoto } from './common';
import { buildApiStarGift } from './gifts';
import { buildTodoItem } from './messageContent';
+import { buildApiStarsAmount } from './payments';
import { buildApiPeerId, getApiChatIdFromMtpPeer } from './peers';
const UNSUPPORTED_ACTION: ApiMessageAction = {
@@ -447,6 +448,36 @@ export function buildApiMessageAction(action: GramJs.TypeMessageAction): ApiMess
count,
};
}
+ if (action instanceof GramJs.MessageActionSuggestedPostApproval) {
+ const {
+ rejected, balanceTooLow, rejectComment, scheduleDate, price,
+ } = action;
+ return {
+ mediaType: 'action',
+ type: 'suggestedPostApproval',
+ isRejected: Boolean(rejected),
+ isBalanceTooLow: Boolean(balanceTooLow),
+ rejectComment,
+ scheduleDate,
+ amount: price ? buildApiStarsAmount(price) : undefined,
+ };
+ }
+ if (action instanceof GramJs.MessageActionSuggestedPostSuccess) {
+ const { price } = action;
+ return {
+ mediaType: 'action',
+ type: 'suggestedPostSuccess',
+ amount: buildApiStarsAmount(price),
+ };
+ }
+ if (action instanceof GramJs.MessageActionSuggestedPostRefund) {
+ const { payerInitiated } = action;
+ return {
+ mediaType: 'action',
+ type: 'suggestedPostRefund',
+ payerInitiated: Boolean(payerInitiated),
+ };
+ }
if (action instanceof GramJs.MessageActionTodoCompletions) {
const {
completed, incompleted,
diff --git a/src/api/gramjs/apiBuilders/messages.ts b/src/api/gramjs/apiBuilders/messages.ts
index 47ba60b78..a3f38a73e 100644
--- a/src/api/gramjs/apiBuilders/messages.ts
+++ b/src/api/gramjs/apiBuilders/messages.ts
@@ -8,6 +8,7 @@ import type {
ApiFactCheck,
ApiInputMessageReplyInfo,
ApiInputReplyInfo,
+ ApiInputSuggestedPostInfo,
ApiMediaTodo,
ApiMessage,
ApiMessageEntity,
@@ -25,6 +26,7 @@ import type {
ApiSticker,
ApiStory,
ApiStorySkipped,
+ ApiSuggestedPost,
ApiThreadInfo,
ApiVideo,
MediaContent,
@@ -44,6 +46,9 @@ import { addTimestampEntities } from '../../../util/dates/timestamp';
import { omitUndefined, pick } from '../../../util/iteratees';
import { getServerTime, getServerTimeOffset } from '../../../util/serverTime';
import { interpolateArray } from '../../../util/waveform';
+import {
+ buildApiStarsAmount,
+} from '../apiBuilders/payments';
import { buildPeer } from '../gramjsBuilders';
import {
addDocumentToLocalDb,
@@ -241,6 +246,7 @@ export function buildApiMessageWithChatId(
reactions: mtpMessage.reactions && buildMessageReactions(mtpMessage.reactions),
emojiOnlyCount,
...(mtpMessage.replyTo && { replyInfo: buildApiReplyInfo(mtpMessage.replyTo, mtpMessage) }),
+ ...(mtpMessage.suggestedPost && { suggestedPostInfo: buildApiSuggestedPost(mtpMessage.suggestedPost) }),
forwardInfo,
isEdited,
editDate: mtpMessage.editDate,
@@ -280,7 +286,7 @@ export function buildMessageDraft(draft: GramJs.TypeDraftMessage): ApiDraft | un
}
const {
- message, entities, replyTo, date, effect,
+ message, entities, replyTo, date, effect, suggestedPost,
} = draft;
const replyInfo = replyTo instanceof GramJs.InputReplyToMessage ? {
@@ -293,14 +299,31 @@ export function buildMessageDraft(draft: GramJs.TypeDraftMessage): ApiDraft | un
quoteOffset: replyTo.quoteOffset,
} satisfies ApiInputMessageReplyInfo : undefined;
+ const suggestedPostInfo = suggestedPost instanceof GramJs.SuggestedPost ? {
+ isAccepted: suggestedPost.accepted,
+ isRejected: suggestedPost.rejected,
+ price: suggestedPost.price ? buildApiStarsAmount(suggestedPost.price) : undefined,
+ scheduleDate: suggestedPost.scheduleDate,
+ } satisfies ApiInputSuggestedPostInfo : undefined;
+
return {
text: message ? buildMessageTextContent(message, entities) : undefined,
replyInfo,
+ suggestedPostInfo,
date,
effectId: effect?.toString(),
};
}
+function buildApiSuggestedPost(suggestedPost: GramJs.SuggestedPost): ApiSuggestedPost {
+ return {
+ isAccepted: suggestedPost.accepted,
+ isRejected: suggestedPost.rejected,
+ price: suggestedPost.price ? buildApiStarsAmount(suggestedPost.price) : undefined,
+ scheduleDate: suggestedPost.scheduleDate,
+ };
+}
+
function buildApiMessageForwardInfo(fwdFrom: GramJs.MessageFwdHeader, isChatWithSelf = false): ApiMessageForwardInfo {
const savedFromPeerId = fwdFrom.savedFromPeer && getApiChatIdFromMtpPeer(fwdFrom.savedFromPeer);
const fromId = fwdFrom.fromId && getApiChatIdFromMtpPeer(fwdFrom.fromId);
@@ -396,6 +419,7 @@ export function buildLocalMessage(
text?: string,
entities?: ApiMessageEntity[],
replyInfo?: ApiInputReplyInfo,
+ suggestedPostInfo?: ApiInputSuggestedPostInfo,
attachment?: ApiAttachment,
sticker?: ApiSticker,
gif?: ApiVideo,
@@ -439,6 +463,7 @@ export function buildLocalMessage(
isOutgoing: !isChannel,
senderId: chat.type !== 'chatTypePrivate' ? (sendAs?.id || currentUserId) : undefined,
replyInfo: resultReplyInfo,
+ suggestedPostInfo,
...(groupedId && {
groupedId,
...(media && (media.photo || media.video) && { isInAlbum: true }),
diff --git a/src/api/gramjs/apiBuilders/payments.ts b/src/api/gramjs/apiBuilders/payments.ts
index f11319852..fb578a2ad 100644
--- a/src/api/gramjs/apiBuilders/payments.ts
+++ b/src/api/gramjs/apiBuilders/payments.ts
@@ -461,11 +461,26 @@ export function buildApiStarsGiftOptions(option: GramJs.StarsGiftOption): ApiSta
};
}
-export function buildApiStarsAmount(amount: GramJs.StarsAmount): ApiStarsAmount {
- return {
- amount: amount.amount.toJSNumber(),
+export function buildApiStarsAmount(amount: GramJs.TypeStarsAmount): ApiStarsAmount | undefined {
+ if (amount instanceof GramJs.StarsAmount) {
+ return {
+ amount: amount.amount.toJSNumber(),
+ nanos: amount.nanos,
+ };
+ }
+
+ if (amount instanceof GramJs.StarsTonAmount) {
+ return undefined;
+ }
+
+ return undefined;
+}
+
+export function buildInputStarsAmount(amount: ApiStarsAmount): GramJs.TypeStarsAmount {
+ return new GramJs.StarsAmount({
+ amount: bigInt(amount.amount),
nanos: amount.nanos,
- };
+ });
}
export function buildApiStarsGiveawayWinnersOption(
@@ -532,9 +547,9 @@ export function buildApiStarsTransactionPeer(peer: GramJs.TypeStarsTransactionPe
return { type: 'unsupported' };
}
-export function buildApiStarsTransaction(transaction: GramJs.StarsTransaction): ApiStarsTransaction {
+export function buildApiStarsTransaction(transaction: GramJs.StarsTransaction): ApiStarsTransaction | undefined {
const {
- date, id, peer, stars, description, photo, title, refund, extendedMedia, failed, msgId, pending, gift, reaction,
+ date, id, peer, amount, description, photo, title, refund, extendedMedia, failed, msgId, pending, gift, reaction,
subscriptionPeriod, stargift, giveawayPostId, starrefCommissionPermille, stargiftUpgrade, paidMessages,
stargiftResale,
} = transaction;
@@ -548,11 +563,16 @@ export function buildApiStarsTransaction(transaction: GramJs.StarsTransaction):
const starRefCommision = starrefCommissionPermille ? starrefCommissionPermille / 10 : undefined;
+ const starsAmount = buildApiStarsAmount(amount);
+ if (!starsAmount) {
+ return undefined;
+ }
+
return {
id,
date,
peer: buildApiStarsTransactionPeer(peer),
- stars: buildApiStarsAmount(stars),
+ stars: starsAmount,
title,
description,
photo: photo && buildApiWebDocument(photo),
diff --git a/src/api/gramjs/apiBuilders/statistics.ts b/src/api/gramjs/apiBuilders/statistics.ts
index 0260b9c6c..281340746 100644
--- a/src/api/gramjs/apiBuilders/statistics.ts
+++ b/src/api/gramjs/apiBuilders/statistics.ts
@@ -54,15 +54,15 @@ export function buildChannelStatistics(stats: GramJs.stats.BroadcastStats): ApiC
}
export function buildChannelMonetizationStatistics(
- stats: GramJs.stats.BroadcastRevenueStats,
+ stats: GramJs.payments.StarsRevenueStats,
): ApiChannelMonetizationStatistics {
return {
// Graphs
- topHoursGraph: buildGraph(stats.topHoursGraph),
+ topHoursGraph: stats.topHoursGraph ? buildGraph(stats.topHoursGraph) : undefined,
revenueGraph: buildGraph(stats.revenueGraph, undefined, true, stats.usdRate),
// Statistics overview
- balances: buildChannelMonetizationBalances(stats.balances),
+ balances: buildChannelMonetizationBalances(stats.status),
usdRate: stats.usdRate,
};
}
@@ -269,7 +269,7 @@ function buildChannelMonetizationBalances({
availableBalance,
overallRevenue,
withdrawalEnabled,
-}: GramJs.BroadcastRevenueBalances): ChannelMonetizationBalances {
+}: GramJs.StarsRevenueStatus): ChannelMonetizationBalances {
return {
currentBalance: Number(currentBalance) / DECIMALS,
availableBalance: Number(availableBalance) / DECIMALS,
diff --git a/src/api/gramjs/gramjsBuilders/index.ts b/src/api/gramjs/gramjsBuilders/index.ts
index 0f6603e3f..e8e2900b0 100644
--- a/src/api/gramjs/gramjsBuilders/index.ts
+++ b/src/api/gramjs/gramjsBuilders/index.ts
@@ -15,6 +15,7 @@ import type {
ApiInputPrivacyRules,
ApiInputReplyInfo,
ApiInputStorePaymentPurpose,
+ ApiInputSuggestedPostInfo,
ApiMessageEntity,
ApiNewMediaTodo,
ApiNewPoll,
@@ -40,6 +41,7 @@ import {
import { CHANNEL_ID_BASE, DEFAULT_STATUS_ICON_ID } from '../../../config';
import { pick } from '../../../util/iteratees';
+import { buildInputStarsAmount } from '../apiBuilders/payments';
import { deserializeBytes } from '../helpers/misc';
import localDb from '../localDb';
@@ -888,6 +890,16 @@ export function buildInputReplyTo(replyInfo: ApiInputReplyInfo) {
return undefined;
}
+export function buildInputSuggestedPost(suggestedPostInfo: ApiInputSuggestedPostInfo): GramJs.SuggestedPost {
+ const isPaid = Boolean(suggestedPostInfo.price)
+ && Boolean((suggestedPostInfo.price.amount || suggestedPostInfo.price.nanos));
+
+ return new GramJs.SuggestedPost({
+ price: isPaid ? buildInputStarsAmount(suggestedPostInfo.price!) : undefined,
+ scheduleDate: suggestedPostInfo.scheduleDate,
+ });
+}
+
export function buildInputPrivacyRules(
rules: ApiInputPrivacyRules,
) {
diff --git a/src/api/gramjs/methods/chats.ts b/src/api/gramjs/methods/chats.ts
index 1e39190b8..1b98753d7 100644
--- a/src/api/gramjs/methods/chats.ts
+++ b/src/api/gramjs/methods/chats.ts
@@ -68,6 +68,7 @@ import {
buildInputPeer,
buildInputPhoto,
buildInputReplyTo,
+ buildInputSuggestedPost,
buildInputUser,
buildMtpMessageEntity,
DEFAULT_PRIMITIVES,
@@ -526,6 +527,7 @@ export function saveDraft({
message: draft?.text?.text || DEFAULT_PRIMITIVES.STRING,
entities: draft?.text?.entities?.map(buildMtpMessageEntity),
replyTo: draft?.replyInfo && buildInputReplyTo(draft.replyInfo),
+ suggestedPost: draft?.suggestedPostInfo && buildInputSuggestedPost(draft.suggestedPostInfo),
}));
}
diff --git a/src/api/gramjs/methods/messages.ts b/src/api/gramjs/methods/messages.ts
index dac234a3b..76a29de4c 100644
--- a/src/api/gramjs/methods/messages.ts
+++ b/src/api/gramjs/methods/messages.ts
@@ -14,6 +14,7 @@ import type {
ApiFormattedText,
ApiGlobalMessageSearchType,
ApiInputReplyInfo,
+ ApiInputSuggestedPostInfo,
ApiMessage,
ApiMessageEntity,
ApiMessageSearchContext,
@@ -76,13 +77,16 @@ import { getApiChatIdFromMtpPeer } from '../apiBuilders/peers';
import { buildApiUser, buildApiUserStatuses } from '../apiBuilders/users';
import {
buildInputChannel,
+ buildInputDocument,
buildInputMediaDocument,
buildInputPeer,
+ buildInputPhoto,
buildInputPoll,
buildInputPollFromExisting,
buildInputReaction,
buildInputReplyTo,
buildInputStory,
+ buildInputSuggestedPost,
buildInputTextWithEntities,
buildInputTodo,
buildInputUser,
@@ -98,6 +102,7 @@ import {
deserializeBytes,
resolveMessageApiChatId,
} from '../helpers/misc';
+import localDb from '../localDb';
import { sendApiUpdate } from '../updates/apiUpdateEmitter';
import { processMessageAndUpdateThreadInfo } from '../updates/entityProcessor';
import { processAffectedHistory, updateChannelState } from '../updates/updateManager';
@@ -266,8 +271,8 @@ export function sendMessageLocal(
params: SendMessageParams,
) {
const {
- chat, lastMessageId, text, entities, replyInfo, attachment, sticker, story, gif, poll, todo, contact,
- scheduledAt, groupedId, sendAs, wasDrafted, isInvertedMedia, effectId, isPending, messagePriceInStars,
+ chat, lastMessageId, text, entities, replyInfo, suggestedPostInfo, attachment, sticker, story, gif, poll, todo,
+ contact, scheduledAt, groupedId, sendAs, wasDrafted, isInvertedMedia, effectId, isPending, messagePriceInStars,
} = params;
if (!chat) return undefined;
@@ -281,6 +286,7 @@ export function sendMessageLocal(
text,
entities,
replyInfo,
+ suggestedPostInfo,
attachment,
sticker,
gif,
@@ -315,7 +321,9 @@ export function sendApiMessage(
onProgress?: ApiOnProgress,
) {
const {
- chat, text, entities, replyInfo, attachment, sticker, story, gif, poll, todo, contact,
+ chat, text, entities, replyInfo, suggestedPostInfo, suggestedMedia,
+ attachment, sticker, story, gif, poll, todo, contact,
+
isSilent, scheduledAt, groupedId, noWebPage, sendAs, shouldUpdateStickerSetOrder,
isInvertedMedia, effectId, webPageMediaSize, webPageUrl, messagePriceInStars,
} = params;
@@ -343,6 +351,7 @@ export function sendApiMessage(
text,
entities,
replyInfo,
+ suggestedPostInfo,
attachment: attachment!,
groupedId,
isSilent,
@@ -353,7 +362,43 @@ export function sendApiMessage(
const messagePromise = (async () => {
let media: GramJs.TypeInputMedia | undefined;
- if (attachment) {
+
+ if (suggestedPostInfo && suggestedMedia && !attachment) {
+ if (suggestedMedia.photo) {
+ const inputPhoto = buildInputPhoto(suggestedMedia.photo);
+ if (inputPhoto) {
+ media = new GramJs.InputMediaPhoto({
+ id: inputPhoto,
+ spoiler: suggestedMedia.photo.isSpoiler || undefined,
+ });
+ }
+ } else if (suggestedMedia.video) {
+ const inputDocument = buildInputDocument(suggestedMedia.video);
+ if (inputDocument) {
+ media = new GramJs.InputMediaDocument({
+ id: inputDocument,
+ spoiler: suggestedMedia.video.isSpoiler || undefined,
+ });
+ }
+ } else if (suggestedMedia.document) {
+ const document = suggestedMedia.document;
+ if (document.id) {
+ const localDocument = localDb.documents[document.id];
+ if (localDocument) {
+ const inputDocument = new GramJs.InputDocument({
+ id: localDocument.id,
+ accessHash: localDocument.accessHash,
+ fileReference: localDocument.fileReference,
+ });
+ media = new GramJs.InputMediaDocument({
+ id: inputDocument,
+ });
+ }
+ }
+ }
+ }
+
+ if (!media && attachment) {
try {
media = await uploadMedia(localMessage, attachment, onProgress!);
} catch (err) {
@@ -416,6 +461,7 @@ export function sendApiMessage(
invertMedia: isInvertedMedia || undefined,
effect: effectId ? BigInt(effectId) : undefined,
allowPaidStars: messagePriceInStars ? BigInt(messagePriceInStars) : undefined,
+ suggestedPost: suggestedPostInfo && buildInputSuggestedPost(suggestedPostInfo),
};
try {
@@ -477,6 +523,7 @@ function sendGroupedMedia(
text = DEFAULT_PRIMITIVES.STRING,
entities,
replyInfo,
+ suggestedPostInfo,
attachment,
groupedId,
isSilent,
@@ -488,6 +535,7 @@ function sendGroupedMedia(
text?: string;
entities?: ApiMessageEntity[];
replyInfo?: ApiInputReplyInfo;
+ suggestedPostInfo?: ApiInputSuggestedPostInfo;
attachment: ApiAttachment;
groupedId: string;
isSilent?: boolean;
@@ -571,6 +619,7 @@ function sendGroupedMedia(
...(scheduledAt && { scheduleDate: scheduledAt }),
...(sendAs && { sendAs: buildInputPeer(sendAs.id, sendAs.accessHash) }),
...(messagePriceInStars && { allowPaidStars: BigInt(messagePriceInStars * count) }),
+ ...(suggestedPostInfo && { suggestedPost: buildInputSuggestedPost(suggestedPostInfo) }),
}), {
shouldIgnoreUpdates: true,
});
@@ -1075,6 +1124,30 @@ export async function deleteSavedHistory({
});
}
+export async function toggleSuggestedPostApproval({
+ chat,
+ messageId,
+ reject,
+ scheduleDate,
+ rejectComment,
+}: {
+ chat: ApiChat;
+ messageId: number;
+ reject?: boolean;
+ scheduleDate?: number;
+ rejectComment?: string;
+}) {
+ const result = await invokeRequest(new GramJs.messages.ToggleSuggestedPostApproval({
+ peer: buildInputPeer(chat.id, chat.accessHash),
+ msgId: messageId,
+ reject: reject || undefined,
+ scheduleDate,
+ rejectComment,
+ }));
+
+ return result;
+}
+
export async function reportMessages({
peer, messageIds, description, option,
}: {
diff --git a/src/api/gramjs/methods/stars.ts b/src/api/gramjs/methods/stars.ts
index bc8e31c98..d58a279a4 100644
--- a/src/api/gramjs/methods/stars.ts
+++ b/src/api/gramjs/methods/stars.ts
@@ -10,6 +10,7 @@ import type {
ApiStarGiftRegular,
} from '../../types';
+import { buildApiChatFromPreview } from '../apiBuilders/chats';
import { buildApiResaleGifts, buildApiSavedStarGift, buildApiStarGift,
buildApiStarGiftAttribute, buildInputResaleGiftsAttributes } from '../apiBuilders/gifts';
import {
@@ -20,6 +21,7 @@ import {
buildApiStarsTransaction,
buildApiStarTopupOption,
} from '../apiBuilders/payments';
+import { buildApiUser } from '../apiBuilders/users';
import { buildInputPeer, buildInputSavedStarGift, buildInputUser, DEFAULT_PRIMITIVES } from '../gramjsBuilders';
import { checkErrorType, wrapError } from '../helpers/misc';
import { invokeRequest } from './client';
@@ -44,8 +46,18 @@ export async function fetchStarGifts() {
return undefined;
}
+ const chats = result.chats?.map((chat) => buildApiChatFromPreview(chat)).filter(Boolean);
+ const users = result.users?.map(buildApiUser).filter(Boolean);
+
// Right now, only regular star gifts can be bought, but API are not specific
- return result.gifts.map(buildApiStarGift).filter((gift): gift is ApiStarGiftRegular => gift.type === 'starGift');
+ const gifts
+ = result.gifts.map(buildApiStarGift).filter((gift): gift is ApiStarGiftRegular => gift.type === 'starGift');
+
+ return {
+ gifts,
+ chats,
+ users,
+ };
}
export async function fetchResaleGifts({
@@ -179,12 +191,18 @@ export async function fetchStarsStatus() {
return undefined;
}
+ const balance = buildApiStarsAmount(result.balance);
+ if (!balance) {
+ // For now, skip if balance is in TON
+ return undefined;
+ }
+
return {
nextHistoryOffset: result.nextOffset,
- history: result.history?.map(buildApiStarsTransaction),
+ history: result.history?.map(buildApiStarsTransaction).filter(Boolean),
nextSubscriptionOffset: result.subscriptionsNextOffset,
subscriptions: result.subscriptions?.map(buildApiStarsSubscription),
- balance: buildApiStarsAmount(result.balance),
+ balance,
};
}
@@ -214,10 +232,16 @@ export async function fetchStarsTransactions({
return undefined;
}
+ const balance = buildApiStarsAmount(result.balance);
+ if (!balance) {
+ // For now, skip if balance is in TON
+ return undefined;
+ }
+
return {
nextOffset: result.nextOffset,
- history: result.history?.map(buildApiStarsTransaction),
- balance: buildApiStarsAmount(result.balance),
+ history: result.history?.map(buildApiStarsTransaction).filter(Boolean),
+ balance,
};
}
@@ -261,10 +285,16 @@ export async function fetchStarsSubscriptions({
return undefined;
}
+ const balance = buildApiStarsAmount(result.balance);
+ if (!balance) {
+ // For now, skip if balance is in TON
+ return undefined;
+ }
+
return {
nextOffset: result.subscriptionsNextOffset,
subscriptions: result.subscriptions.map(buildApiStarsSubscription),
- balance: buildApiStarsAmount(result.balance),
+ balance,
};
}
diff --git a/src/api/gramjs/methods/statistics.ts b/src/api/gramjs/methods/statistics.ts
index 1a3cbff76..eaa769f90 100644
--- a/src/api/gramjs/methods/statistics.ts
+++ b/src/api/gramjs/methods/statistics.ts
@@ -45,7 +45,7 @@ export async function fetchChannelMonetizationStatistics({
peer: ApiPeer;
dcId?: number;
}) {
- const result = await invokeRequest(new GramJs.stats.GetBroadcastRevenueStats({
+ const result = await invokeRequest(new GramJs.payments.GetStarsRevenueStats({
peer: buildInputPeer(peer.id, peer.accessHash),
}), {
dcId,
@@ -234,7 +234,7 @@ export async function fetchMonetizationRevenueWithdrawalUrl({
return password;
}
- const result = await invokeRequest(new GramJs.stats.GetBroadcastRevenueWithdrawalUrl({
+ const result = await invokeRequest(new GramJs.payments.GetStarsRevenueWithdrawalUrl({
peer: buildInputPeer(peer.id, peer.accessHash),
password,
}), {
diff --git a/src/api/gramjs/updates/mtpUpdateHandler.ts b/src/api/gramjs/updates/mtpUpdateHandler.ts
index 0f691f3cb..bcf523f80 100644
--- a/src/api/gramjs/updates/mtpUpdateHandler.ts
+++ b/src/api/gramjs/updates/mtpUpdateHandler.ts
@@ -1042,9 +1042,14 @@ export function updater(update: Update) {
isEnabled: update.enabled ? true : undefined,
});
} else if (update instanceof GramJs.UpdateStarsBalance) {
+ const balance = buildApiStarsAmount(update.balance);
+ if (!balance) {
+ // Skip TON balance updates for now
+ return;
+ }
sendApiUpdate({
'@type': 'updateStarsBalance',
- balance: buildApiStarsAmount(update.balance),
+ balance,
});
} else if (update instanceof GramJs.UpdatePaidReactionPrivacy) {
sendApiUpdate({
diff --git a/src/api/types/chats.ts b/src/api/types/chats.ts
index 315ece68e..e8cc18851 100644
--- a/src/api/types/chats.ts
+++ b/src/api/types/chats.ts
@@ -1,6 +1,6 @@
import type { ApiBotCommand } from './bots';
import type {
- ApiChatReactions, ApiFormattedText, ApiInputMessageReplyInfo, ApiPhoto, ApiStickerSet,
+ ApiChatReactions, ApiFormattedText, ApiInputMessageReplyInfo, ApiInputSuggestedPostInfo, ApiPhoto, ApiStickerSet,
} from './messages';
import type { ApiBotVerification, ApiChatInviteImporter, ApiPeerNotifySettings } from './misc';
import type {
@@ -318,6 +318,7 @@ export interface ApiChatLink {
export type ApiDraft = {
text?: ApiFormattedText;
replyInfo?: ApiInputMessageReplyInfo;
+ suggestedPostInfo?: ApiInputSuggestedPostInfo;
date?: number;
effectId?: string;
isLocal?: boolean;
diff --git a/src/api/types/messageActions.ts b/src/api/types/messageActions.ts
index 23d18bf58..76806c2a7 100644
--- a/src/api/types/messageActions.ts
+++ b/src/api/types/messageActions.ts
@@ -1,7 +1,7 @@
import type { ApiGroupCall, ApiPhoneCallDiscardReason } from './calls';
import type { ApiBotApp, ApiFormattedText, ApiPhoto } from './messages';
import type { ApiTodoItem } from './messages';
-import type { ApiStarGiftRegular, ApiStarGiftUnique } from './stars';
+import type { ApiStarGiftRegular, ApiStarGiftUnique, ApiStarsAmount } from './stars';
interface ActionMediaType {
mediaType: 'action';
@@ -282,6 +282,25 @@ export interface ApiMessageActionPaidMessagesPrice extends ActionMediaType {
isAllowedInChannel?: boolean;
}
+export interface ApiMessageActionSuggestedPostApproval extends ActionMediaType {
+ type: 'suggestedPostApproval';
+ isRejected?: boolean;
+ isBalanceTooLow?: boolean;
+ rejectComment?: string;
+ scheduleDate?: number;
+ amount?: ApiStarsAmount;
+}
+
+export interface ApiMessageActionSuggestedPostSuccess extends ActionMediaType {
+ type: 'suggestedPostSuccess';
+ amount?: ApiStarsAmount;
+}
+
+export interface ApiMessageActionSuggestedPostRefund extends ActionMediaType {
+ type: 'suggestedPostRefund';
+ payerInitiated: boolean;
+}
+
export interface ApiMessageActionTodoCompletions extends ActionMediaType {
type: 'todoCompletions';
completedIds: number[];
@@ -310,5 +329,6 @@ export type ApiMessageAction = ApiMessageActionUnsupported | ApiMessageActionCha
| ApiMessageActionChannelJoined | ApiMessageActionGiftCode | ApiMessageActionGiveawayLaunch
| ApiMessageActionGiveawayResults | ApiMessageActionPaymentRefunded | ApiMessageActionGiftStars
| ApiMessageActionPrizeStars | ApiMessageActionStarGift | ApiMessageActionStarGiftUnique
- | ApiMessageActionPaidMessagesRefunded | ApiMessageActionPaidMessagesPrice | ApiMessageActionTodoCompletions
+ | ApiMessageActionPaidMessagesRefunded | ApiMessageActionPaidMessagesPrice | ApiMessageActionSuggestedPostApproval
+ | ApiMessageActionSuggestedPostSuccess | ApiMessageActionSuggestedPostRefund | ApiMessageActionTodoCompletions
| ApiMessageActionTodoAppendTasks;
diff --git a/src/api/types/messages.ts b/src/api/types/messages.ts
index a606691c8..c675b901d 100644
--- a/src/api/types/messages.ts
+++ b/src/api/types/messages.ts
@@ -9,7 +9,7 @@ import type { ApiMessageAction } from './messageActions';
import type {
ApiLabeledPrice,
} from './payments';
-import type { ApiStarGiftUnique } from './stars';
+import type { ApiStarGiftUnique, ApiStarsAmount } from './stars';
import type {
ApiMessageStoryData, ApiStory, ApiWebPageStickerData, ApiWebPageStoryData,
} from './stories';
@@ -412,12 +412,26 @@ export interface ApiInputMessageReplyInfo {
quoteOffset?: number;
}
+export interface ApiSuggestedPost {
+ isAccepted?: true;
+ isRejected?: true;
+ price?: ApiStarsAmount;
+ scheduleDate?: number;
+}
+
export interface ApiInputStoryReplyInfo {
type: 'story';
peerId: string;
storyId: number;
}
+export interface ApiInputSuggestedPostInfo {
+ price?: ApiStarsAmount;
+ scheduleDate?: number;
+ isAccepted?: true;
+ isRejected?: true;
+}
+
export type ApiInputReplyInfo = ApiInputMessageReplyInfo | ApiInputStoryReplyInfo;
export interface ApiMessageForwardInfo {
@@ -577,6 +591,7 @@ export interface ApiMessage {
isOutgoing: boolean;
senderId?: string;
replyInfo?: ApiReplyInfo;
+ suggestedPostInfo?: ApiInputSuggestedPostInfo;
sendingState?: 'messageSendingStatePending' | 'messageSendingStateFailed';
forwardInfo?: ApiMessageForwardInfo;
isDeleting?: boolean;
@@ -866,6 +881,13 @@ interface ApiKeyboardButtonCopy {
copyText: string;
}
+export interface ApiKeyboardButtonSuggestedMessage {
+ type: 'suggestedMessage';
+ text: string;
+ buttonType: 'approve' | 'decline' | 'suggestChanges';
+ disabled?: boolean;
+}
+
export type ApiKeyboardButton = (
ApiKeyboardButtonSimple
| ApiKeyboardButtonReceipt
@@ -878,6 +900,7 @@ export type ApiKeyboardButton = (
| ApiKeyboardButtonSimpleWebView
| ApiKeyboardButtonUrlAuth
| ApiKeyboardButtonCopy
+ | ApiKeyboardButtonSuggestedMessage
);
export type ApiKeyboardButtons = ApiKeyboardButton[][];
diff --git a/src/api/types/misc.ts b/src/api/types/misc.ts
index 7e83f37c8..502c60ee2 100644
--- a/src/api/types/misc.ts
+++ b/src/api/types/misc.ts
@@ -252,6 +252,13 @@ export interface ApiAppConfig {
starsStargiftResaleAmountMin?: number;
starsStargiftResaleAmountMax?: number;
starsStargiftResaleCommissionPermille?: number;
+ starsSuggestedPostAmountMax?: number;
+ starsSuggestedPostAmountMin?: number;
+ starsSuggestedPostCommissionPermille?: number;
+ starsSuggestedPostAgeMin?: number;
+ starsSuggestedPostFutureMax?: number;
+ starsSuggestedPostFutureMin?: number;
+ tonSuggestedPostCommissionPermille?: number;
pollMaxAnswers?: number;
todoItemsMax?: number;
todoTitleLengthMax?: number;
diff --git a/src/api/types/stars.ts b/src/api/types/stars.ts
index f2588a756..72e7571bc 100644
--- a/src/api/types/stars.ts
+++ b/src/api/types/stars.ts
@@ -19,6 +19,7 @@ export interface ApiStarGiftRegular {
isBirthday?: true;
upgradeStars?: number;
resellMinStars?: number;
+ releasedByPeerId?: string;
title?: string;
}
@@ -36,6 +37,7 @@ export interface ApiStarGiftUnique {
slug: string;
giftAddress?: string;
resellPriceInStars?: number;
+ releasedByPeerId?: string;
}
export type ApiStarGift = ApiStarGiftRegular | ApiStarGiftUnique;
diff --git a/src/assets/localization/fallback.strings b/src/assets/localization/fallback.strings
index 5e66c9666..fca2cc1e7 100644
--- a/src/assets/localization/fallback.strings
+++ b/src/assets/localization/fallback.strings
@@ -2025,6 +2025,70 @@
"MonoforumComposerPlaceholder" = "Choose a message to reply";
"ChannelSendMessage" = "Direct Messages";
"AutomaticTranslation" = "Automatic Translation";
+"ComposerEmbeddedMessageSuggestedPostTitle" = "Suggest a Post Below";
+"ComposerEmbeddedMessageSuggestedPostDescription" = "Tap to offer a price for publishing";
+"TitleSuggestedPostAmountForAnyTime" = "{amount} for publishing anytime";
+"ActionSuggestedPostOutgoing" = "**You** suggest to post this message.";
+"ActionSuggestedPostIncoming" = "**{user}** suggest to post this message.";
+"ActionSuggestedChangesPrice" = "price";
+"ActionSuggestedChangesText" = "text";
+"ActionSuggestedChangesTime" = "time";
+"ActionSuggestedChangesMedia" = "media";
+"ActionSuggestedChangesOutgoing" = "**You** suggested a new {changes} for this post.";
+"ActionSuggestedChangesIncoming" = "**{user}** suggested a new {changes} for this post.";
+"TitlePrice" = "Price";
+"TitleTime" = "Time";
+"TitleSuggestMessage" = "Suggest a Message";
+"TitleSuggestedChanges" = "Suggest Changes";
+"EnterPriceInStars" = "Enter Price In Stars";
+"SuggestMessagePriceDescription" = "Choose how many {currency} to pay to publish this post.";
+"SuggestMessageDateTimeHint" = "Select the date and time you want the post to be published.";
+"SuggestMessageTimeDescription" = "{hint} The post will remain available for at least {duration} from this date.";
+"TitleAnytime" = "Anytime";
+"ButtonOfferAmount" = "Offer {amount}";
+"ButtonOfferFree" = "Offer Free";
+"ButtonUpdateTerms" = "Update Terms";
+"InputPlaceholderPrice" = "Enter Price";
+"SuggestedPostApprove" = "Approve";
+"SuggestedPostDecline" = "Decline";
+"SuggestedPostSuggestChanges" = "Suggest Changes";
+"InputTitleSuggestMessageTime" = "Publishing Time";
+"SuggestedPostApproved" = "Suggested post approved";
+"SuggestedPostRejectedNotification" = "Suggested post rejected";
+"SuggestedPostAgreementReached" = "🤝 Agreement reached!";
+"SuggestedPostPublishSchedule" = "📅 This post will be automatically published on {peer} **{date}**.";
+"SuggestedPostPublishScheduleYou" = "📅 Your post will be automatically published on {peer} **{date}**.";
+"SuggestedPostPublished" = "📅 This post was automatically published on {peer} **{date}**.";
+"SuggestedPostPublishedYou" = "📅 Your post was automatically published on {peer} **{date}**.";
+"SuggestedPostCharged" = "💰 {user} has been charged {amount}.";
+"SuggestedPostChargedYou" = "💰 You have been charged {amount}.";
+"SuggestedPostReceiveAmount" = "⏳ {peer} will receive the {currency} once the post has been live for {duration}.";
+"SuggestedPostReceiveAmountYou" = "⏳ {peer} will receive your {currency} once the post has been live for {duration}.";
+"SuggestedPostRefund" = "🔄 If {peer} removes the post before it has been live for {duration}, payment will be refunded.";
+"SuggestedPostRefundYou" = "🔄 If {peer} removes the post before it has been live for {duration}, your {currency} will be refunded.";
+"SuggestedPostBalanceTooLow" = "⚠️ **Transaction failed** because {peer} didn't have enough {currency}.";
+"SuggestedPostRefundedByUser" = "{channel} will not receive {amount} because {user} requested a refund.";
+"SuggestedPostRefundedByChannel" = "{amount} was returned to {peer} because {channel} deleted the message.";
+"CurrencyStars" = "Stars";
+"DeclineReasonPlaceholder" = "Add a reason (optional)";
+"DeclinePostDialogQuestion" = "Do you want to decline this post from **{sender}**?";
+"SuggestedPostRejected" = "**{peer}** rejected this message.";
+"SuggestedPostRejectedYou" = "You rejected this message.";
+"SuggestedPostRejectedWithReason" = "**{peer}** rejected this message with the comment.";
+"SuggestedPostRejectedWithReasonYou" = "You rejected this message with the comment.";
+"SuggestedPostRejectedComment" = "\"{comment}\"";
+"ActionSuggestedPostSuccess" = "{channel} has received {amount} for publishing post";
+"ComposerPlaceholderCaption" = "Caption";
+"DescriptionSuggestedPostMinimumOffer" = "Minimum offer is **{amount}**.";
+"SuggestedPostConfirmTitle" = "Accept Terms";
+"SuggestedPostConfirmMessage" = "Do you want to publish this post from **{peer}**?";
+"SuggestedPostConfirmDetailsAdmin" = "You will receive **{amount}** ({commission}%) for publishing this post. It must remain visible for at least {duration} after publication.";
+"SuggestedPostConfirmDetailsUser" = "You will pay **{amount}** ({commission}%) for publishing this post. It must remain visible for at least {duration} after publication.";
+"SuggestedPostConfirmDetailsWithTimeAdmin" = "You will receive **{amount}** ({commission}%) for publishing this post **{time}**. It must remain visible for at least {duration} after publication.";
+"SuggestedPostConfirmDetailsWithTimeUser" = "You will pay **{amount}** ({commission}%) for publishing this post **{time}**. It must remain visible for at least {duration} after publication.";
+"ButtonPublish" = "Publish";
+"ButtonPublishAtTime" = "Publish {time}";
+"PublishNow" = "Publish Now";
"TitleNewToDoList" = "New Checklist";
"TitleEditToDoList" = "Edit Checklist";
"TitleAppendToDoList" = "Append Checklist";
@@ -2061,4 +2125,5 @@
"HintTodoListTasksCount" = "You can add {count} more tasks";
"ToDoListErrorChooseTitle" = "Please enter a title.";
"ToDoListErrorChooseTasks" = "Please enter at least one task.";
-"PremiumPreviewTodo" = "Checklists";
+"GiftInfoCollectibleBy" = "Collectible #{number} by **{owner}**";
+"PremiumPreviewTodo" = "Checklists";
\ No newline at end of file
diff --git a/src/bundles/extra.ts b/src/bundles/extra.ts
index f6a6f4f44..5c2a8d801 100644
--- a/src/bundles/extra.ts
+++ b/src/bundles/extra.ts
@@ -37,6 +37,9 @@ export { default as ReportModal } from '../components/modals/reportModal/ReportM
export { default as PreparedMessageModal } from '../components/modals/preparedMessage/PreparedMessageModal';
export { default as SharePreparedMessageModal }
from '../components/modals/sharePreparedMessage/SharePreparedMessageModal';
+export { default as SuggestMessageModal } from '../components/modals/suggestMessage/SuggestMessageModal';
+export { default as SuggestedPostApprovalModal }
+ from '../components/modals/suggestedPostApproval/SuggestedPostApprovalModal';
export { default as CalendarModal } from '../components/common/CalendarModal';
export { default as DeleteMessageModal } from '../components/common/DeleteMessageModal';
export { default as PinMessageModal } from '../components/common/PinMessageModal';
diff --git a/src/components/common/CalendarModal.scss b/src/components/common/CalendarModal.scss
index e996a5512..1ce1caa2e 100644
--- a/src/components/common/CalendarModal.scss
+++ b/src/components/common/CalendarModal.scss
@@ -30,6 +30,15 @@
flex-direction: column;
justify-content: flex-end;
+ .description {
+ min-height: 2.75rem;
+ margin-bottom: 1rem;
+ margin-left: 1rem;
+
+ font-size: 0.875rem;
+ color: var(--color-text-secondary);
+ }
+
.Button {
text-transform: none;
diff --git a/src/components/common/CalendarModal.tsx b/src/components/common/CalendarModal.tsx
index 8523e5b88..4c98ad40c 100644
--- a/src/components/common/CalendarModal.tsx
+++ b/src/components/common/CalendarModal.tsx
@@ -33,8 +33,10 @@ export type OwnProps = {
withTimePicker?: boolean;
submitButtonLabel?: string;
secondButtonLabel?: string;
+ description?: string;
onClose: () => void;
onSubmit: (date: Date) => void;
+ onDateChange?: (date: Date) => void;
onSecondButtonClick?: NoneToVoidFunction;
};
@@ -58,8 +60,10 @@ const CalendarModal: FC = ({
withTimePicker,
submitButtonLabel,
secondButtonLabel,
+ description,
onClose,
onSubmit,
+ onDateChange,
onSecondButtonClick,
}) => {
const lang = useOldLang();
@@ -169,6 +173,7 @@ const CalendarModal: FC = ({
dateCopy.setMonth(currentMonth);
dateCopy.setFullYear(currentYear);
+ onDateChange?.(dateCopy);
return dateCopy;
});
}
@@ -196,11 +201,12 @@ const CalendarModal: FC = ({
const date = new Date(selectedDate.getTime());
date.setHours(hours);
setSelectedDate(date);
+ onDateChange?.(date);
const hoursStr = formatInputTime(hours);
setSelectedHours(hoursStr);
e.target.value = hoursStr;
- }, [selectedDate]);
+ }, [selectedDate, onDateChange]);
const handleChangeMinutes = useCallback((e: React.ChangeEvent) => {
const value = e.target.value.replace(/[^\d]+/g, '');
@@ -215,11 +221,12 @@ const CalendarModal: FC = ({
const date = new Date(selectedDate.getTime());
date.setMinutes(minutes);
setSelectedDate(date);
+ onDateChange?.(date);
const minutesStr = formatInputTime(minutes);
setSelectedMinutes(minutesStr);
e.target.value = minutesStr;
- }, [selectedDate]);
+ }, [selectedDate, onDateChange]);
function renderTimePicker() {
return (
@@ -331,6 +338,11 @@ const CalendarModal: FC = ({
{withTimePicker && renderTimePicker()}