Sticker Picker: Support current chat sticker pack (#1880)

src/api/gramjs/methods/chats.ts

@@ -44,6 +44,15 @@ import {
 import { addEntitiesWithPhotosToLocalDb, addMessageToLocalDb, addPhotoToLocalDb } from '../helpers';
 import { buildApiPeerId, getApiChatIdFromMtpPeer } from '../apiBuilders/peers';
 import { buildApiPhoto } from '../apiBuilders/common';
+import { buildStickerSet } from '../apiBuilders/symbols';
+
+type FullChatData = {
+  fullInfo: ApiChatFullInfo;
+  users?: ApiUser[];
+  userStatusesById: { [userId: string]: ApiUserStatus };
+  groupCall?: Partial<ApiGroupCall>;
+  membersCount?: number;
+};
 
 const MAX_INT_32 = 2 ** 31 - 1;
 let onUpdate: OnApiUpdate;
@@ -336,13 +345,7 @@ export function clearDraft(chat: ApiChat) {
   }));
 }
 
-async function getFullChatInfo(chatId: string): Promise<{
+async function getFullChatInfo(chatId: string): Promise<FullChatData | undefined> {
-  fullInfo: ApiChatFullInfo;
-  users?: ApiUser[];
-  userStatusesById?: { [userId: string]: ApiUserStatus };
-  groupCall?: Partial<ApiGroupCall>;
-  membersCount?: number;
-} | undefined> {
   const result = await invokeRequest(new GramJs.messages.GetFullChat({
     chatId: buildInputEntity(chatId) as BigInt.BigInteger,
   }));
@@ -404,13 +407,7 @@ async function getFullChannelInfo(
   id: string,
   accessHash: string,
   adminRights?: ApiChatAdminRights,
-): Promise<{
+): Promise<FullChatData | undefined> {
-    fullInfo: ApiChatFullInfo;
-    users?: ApiUser[];
-    userStatusesById: { [userId: string]: ApiUserStatus };
-    groupCall?: Partial<ApiGroupCall>;
-    membersCount?: number;
-  } | undefined> {
   const result = await invokeRequest(new GramJs.channels.GetFullChannel({
     channel: buildInputEntity(id, accessHash) as GramJs.InputChannel,
   }));
@@ -439,6 +436,7 @@ async function getFullChannelInfo(
     recentRequesters,
     statsDc,
     participantsCount,
+    stickerset,
   } = result.fullChat;
 
   const inviteLink = exportedInvite instanceof GramJs.ChatInviteExported
@@ -501,6 +499,7 @@ async function getFullChannelInfo(
       requestsPending,
       recentRequesterIds: recentRequesters?.map((userId) => buildApiPeerId(userId, 'user')),
       statisticsDcId: statsDc,
+      stickerSet: stickerset ? buildStickerSet(stickerset) : undefined,
     },
     users: [...(users || []), ...(bannedUsers || []), ...(adminUsers || [])],
     userStatusesById: statusesById,

src/api/types/chats.ts

@@ -1,4 +1,4 @@
-import { ApiMessage, ApiPhoto } from './messages';
+import { ApiMessage, ApiPhoto, ApiStickerSet } from './messages';
 import { ApiBotCommand } from './bots';
 import { ApiChatInviteImporter } from './misc';
 import { ApiFakeType } from './users';
@@ -104,6 +104,7 @@ export interface ApiChatFullInfo {
   recentRequesterIds?: string[];
   requestsPending?: number;
   statisticsDcId?: number;
+  stickerSet?: ApiStickerSet;
 }
 
 export interface ApiChatMember {

src/components/middle/composer/StickerPicker.tsx

@@ -3,10 +3,11 @@ import React, {
 } from '../../../lib/teact/teact';
 import { getActions, withGlobal } from '../../../global';
 
-import { ApiStickerSet, ApiSticker } from '../../../api/types';
+import { ApiStickerSet, ApiSticker, ApiChat } from '../../../api/types';
 import { StickerSetOrRecent } from '../../../types';
 
 import {
+  CHAT_STICKER_SET_ID,
   FAVORITE_SYMBOL_SET_ID, RECENT_SYMBOL_SET_ID, SLIDE_TRANSITION_DURATION, STICKER_SIZE_PICKER_HEADER,
 } from '../../../config';
 import { IS_TOUCH_ENV } from '../../../util/environment';
@@ -14,7 +15,8 @@ import { MEMO_EMPTY_ARRAY } from '../../../util/memo';
 import fastSmoothScroll from '../../../util/fastSmoothScroll';
 import buildClassName from '../../../util/buildClassName';
 import fastSmoothScrollHorizontal from '../../../util/fastSmoothScrollHorizontal';
-import { selectIsChatWithSelf } from '../../../global/selectors';
+import { pickTruthy } from '../../../util/iteratees';
+import { selectChat, selectIsChatWithSelf } from '../../../global/selectors';
 
 import useAsyncRendering from '../../right/hooks/useAsyncRendering';
 import { useIntersectionObserver } from '../../../hooks/useIntersectionObserver';
@@ -22,6 +24,7 @@ import useHorizontalScroll from '../../../hooks/useHorizontalScroll';
 import useLang from '../../../hooks/useLang';
 import useSendMessageAction from '../../../hooks/useSendMessageAction';
 
+import Avatar from '../../common/Avatar';
 import Loading from '../../ui/Loading';
 import Button from '../../ui/Button';
 import StickerButton from '../../common/StickerButton';
@@ -41,6 +44,7 @@ type OwnProps = {
 };
 
 type StateProps = {
+  chat?: ApiChat;
   recentStickers: ApiSticker[];
   favoriteStickers: ApiSticker[];
   stickerSetsById: Record<string, ApiStickerSet>;
@@ -56,7 +60,7 @@ const STICKER_INTERSECTION_THROTTLE = 200;
 const stickerSetIntersections: boolean[] = [];
 
 const StickerPicker: FC<OwnProps & StateProps> = ({
-  chatId,
+  chat,
   threadId,
   className,
   loadAndPlay,
@@ -82,7 +86,8 @@ const StickerPicker: FC<OwnProps & StateProps> = ({
   // eslint-disable-next-line no-null/no-null
   const headerRef = useRef<HTMLDivElement>(null);
   const [activeSetIndex, setActiveSetIndex] = useState<number>(0);
-  const sendMessageAction = useSendMessageAction(chatId, threadId);
+
+  const sendMessageAction = useSendMessageAction(chat!.id, threadId);
 
   const { observe: observeIntersection } = useIntersectionObserver({
     rootRef: containerRef,
@@ -139,11 +144,23 @@ const StickerPicker: FC<OwnProps & StateProps> = ({
       });
     }
 
+    if (chat?.fullInfo?.stickerSet) {
+      const fullSet = stickerSetsById[chat.fullInfo.stickerSet.id];
+      if (fullSet) {
+        defaultSets.push({
+          id: CHAT_STICKER_SET_ID,
+          title: lang('GroupStickers'),
+          stickers: fullSet.stickers,
+          count: fullSet.stickers!.length,
+        });
+      }
+    }
+
     return [
       ...defaultSets,
-      ...addedSetIds.map((id) => stickerSetsById[id]).filter(Boolean),
+      ...Object.values(pickTruthy(stickerSetsById, addedSetIds)),
     ];
-  }, [addedSetIds, lang, recentStickers, favoriteStickers, stickerSetsById]);
+  }, [addedSetIds, favoriteStickers, recentStickers, chat, lang, stickerSetsById]);
 
   const noPopulatedSets = useMemo(() => (
     areAddedLoaded
@@ -213,6 +230,7 @@ const StickerPicker: FC<OwnProps & StateProps> = ({
 
     if (stickerSet.id === RECENT_SYMBOL_SET_ID
       || stickerSet.id === FAVORITE_SYMBOL_SET_ID
+      || stickerSet.id === CHAT_STICKER_SET_ID
       || stickerSet.hasThumbnail
       || !firstSticker) {
       return (
@@ -230,6 +248,8 @@ const StickerPicker: FC<OwnProps & StateProps> = ({
             <i className="icon-recent" />
           ) : stickerSet.id === FAVORITE_SYMBOL_SET_ID ? (
             <i className="icon-favorite" />
+          ) : stickerSet.id === CHAT_STICKER_SET_ID ? (
+            <Avatar chat={chat} size="small" />
           ) : stickerSet.isLottie ? (
             <StickerSetCoverAnimated
               stickerSet={stickerSet as ApiStickerSet}
@@ -320,8 +340,10 @@ export default memo(withGlobal<OwnProps>(
     } = global.stickers;
 
     const isSavedMessages = selectIsChatWithSelf(global, chatId);
+    const chat = selectChat(global, chatId);
 
     return {
+      chat,
       recentStickers: recent.stickers,
       favoriteStickers: favorite.stickers,
       stickerSetsById: setsById,

src/config.ts

@@ -141,6 +141,7 @@ export const RECENT_STICKERS_LIMIT = 20;
 export const NO_STICKER_SET_ID = 'NO_STICKER_SET';
 export const RECENT_SYMBOL_SET_ID = 'recent';
 export const FAVORITE_SYMBOL_SET_ID = 'favorite';
+export const CHAT_STICKER_SET_ID = 'chatStickers';
 
 export const BASE_EMOJI_KEYWORD_LANG = 'en';
 

src/global/actions/api/chats.ts

@@ -1135,6 +1135,15 @@ export async function loadFullChat(chat: ApiChat) {
 
   setGlobal(global);
 
+  const stickerSet = fullInfo.stickerSet;
+  if (stickerSet) {
+    getActions().loadStickers({
+      stickerSetId: stickerSet.id,
+      stickerSetAccessHash: stickerSet.accessHash,
+      stickerSetShortName: stickerSet.shortName,
+    });
+  }
+
   return result;
 }