ignore sensitive-only restricted if can change

teidesu · teidesu · commit 3934c37c11ee · 2025-08-07T17:14:07.000+03:00
diff --git a/src/components/chat/chat.ts b/src/components/chat/chat.ts
@@ -865,7 +865,6 @@ export default class Chat extends EventListenerBase<{
     const [
       noForwards,
       restrictions,
-      isRestricted,
       isLikeGroup,
       isRealGroup,
       _,
@@ -881,7 +880,6 @@ export default class Chat extends EventListenerBase<{
     ] = await m(Promise.all([
       this.managers.appPeersManager.noForwards(peerId),
       this.managers.appPeersManager.getPeerRestrictions(peerId),
-      this.managers.appPeersManager.isPeerRestricted(peerId),
       this._isLikeGroup(peerId),
       this.managers.appPeersManager.isAnyGroup(peerId),
       this.setAutoDownloadMedia(),
@@ -915,7 +913,7 @@ export default class Chat extends EventListenerBase<{
     this.isPremiumRequired = isPremiumRequired;
     this.starsAmount = starsAmount;
 
-    this.isRestricted = isRestricted;
+    this.isRestricted = await this.managers.appPeersManager.isPeerRestricted(peerId); // need sensitiveContentSettings
     this.sensitiveContentSettings = sensitiveContentSettings;
     ignoreRestrictionReasons(this.sensitiveContentSettings.ignoreRestrictionReasons);
     this.isSensitive = isSensitive(restrictions);
diff --git a/src/components/chat/input.ts b/src/components/chat/input.ts
@@ -4103,7 +4103,7 @@ export default class ChatInput {
     fastRaf(() => {
       focus && placeCaretAtEnd(this.messageInput);
       this.processingDraftMessage = draftMessage;
-      this.setEffect(draftMessage.effect);
+      if(draftMessage) this.setEffect(draftMessage.effect);
       this.onMessageInput();
       this.processingDraftMessage = undefined;
       this.messageInput.scrollTop = this.messageInput.scrollHeight;
diff --git a/src/lib/appManagers/appPeersManager.ts b/src/lib/appManagers/appPeersManager.ts
@@ -23,6 +23,7 @@ import isPeerRestricted from './utils/peers/isPeerRestricted';
 import getPeerPhoto from './utils/peers/getPeerPhoto';
 import getServerMessageId from './utils/messageId/getServerMessageId';
 import MTProtoMessagePort from '../mtproto/mtprotoMessagePort';
+import {SensitiveContentSettings} from './appPrivacyManager';
 
 export type PeerType = 'channel' | 'chat' | 'megagroup' | 'group' | 'saved' | 'savedDialog';
 export class AppPeersManager extends AppManager {
@@ -165,7 +166,9 @@ export class AppPeersManager extends AppManager {
   }
 
   public isPeerRestricted(peerId: PeerId) {
-    return isPeerRestricted(this.getPeer(peerId));
+    const settings = this.appPrivacyManager.getSensitiveContentSettings();
+    const canChangeSensitive = (settings as SensitiveContentSettings).sensitiveCanChange ?? false;
+    return isPeerRestricted(this.getPeer(peerId), canChangeSensitive);
   }
 
   public isPeerPublic(peerId: PeerId) {
diff --git a/src/lib/appManagers/appPrivacyManager.ts b/src/lib/appManagers/appPrivacyManager.ts
@@ -102,26 +102,31 @@ export class AppPrivacyManager extends AppManager {
     return this.apiManager.invokeApi('account.setGlobalPrivacySettings', {settings});
   }
 
-  public async getSensitiveContentSettings() {
+  private _getSensitiveContentSettingsPromise: Promise<SensitiveContentSettings> | null = null;
+  public getSensitiveContentSettings() {
     if(this.sensitiveContentSettings) return this.sensitiveContentSettings;
-    const [contentSettings, state, appConfig] = await Promise.all([
+    if(this._getSensitiveContentSettingsPromise) return this._getSensitiveContentSettingsPromise;
+
+    return this._getSensitiveContentSettingsPromise = Promise.all([
       this.apiManager.invokeApi('account.getContentSettings'),
       this.appStateManager.getState(),
       this.apiManager.getAppConfig()
-    ]);
-
-    this.sensitiveContentSettings = {
-      sensitiveEnabled: contentSettings.pFlags.sensitive_enabled ?? false,
-      sensitiveCanChange: contentSettings.pFlags.sensitive_can_change ?? false,
-      // ignoreRestrictionReasons: [],
-      // needAgeVerification: true,
-      // ageVerified: false
-      ignoreRestrictionReasons: appConfig.ignore_restriction_reasons ?? [],
-      needAgeVerification: appConfig.need_age_video_verification ?? false,
-      ageVerified: !!state.ageVerification
-    };
-
-    return this.sensitiveContentSettings;
+    ]).then(([contentSettings, state, appConfig]) => {
+      this.sensitiveContentSettings = {
+        sensitiveEnabled: contentSettings.pFlags.sensitive_enabled ?? false,
+        sensitiveCanChange: contentSettings.pFlags.sensitive_can_change ?? false,
+        // ignoreRestrictionReasons: [],
+        // needAgeVerification: true,
+        // ageVerified: false
+        ignoreRestrictionReasons: appConfig.ignore_restriction_reasons ?? [],
+        needAgeVerification: appConfig.need_age_video_verification ?? false,
+        ageVerified: !!state.ageVerification
+      };
+
+      return this.sensitiveContentSettings;
+    }).finally(() => {
+      this._getSensitiveContentSettingsPromise = null;
+    });;
   }
 
   public async setContentSettings(settings: AccountSetContentSettings) {
diff --git a/src/lib/appManagers/utils/peers/isPeerRestricted.ts b/src/lib/appManagers/utils/peers/isPeerRestricted.ts
@@ -1,7 +1,11 @@
 import {isRestricted} from '../../../../helpers/restrictions';
 import {Chat, User} from '../../../../layer';
 
-export default function isPeerRestricted(peer: Chat | User) {
-  const restrictionReasons = (peer as Chat.channel)?.restriction_reason;
-  return !!(restrictionReasons && (peer as Chat.channel).pFlags.restricted && isRestricted(restrictionReasons));
+export default function isPeerRestricted(peer: Chat | User, canChangeSensitive = true) {
+  let restrictionReasons = (peer as Chat.channel | User.user)?.restriction_reason;
+  if(!(restrictionReasons && (peer as Chat.channel | User.user).pFlags.restricted)) return false;
+  if(canChangeSensitive) {
+    restrictionReasons = restrictionReasons.filter((reason) => reason.reason !== 'sensitive');
+  }
+  return isRestricted(restrictionReasons);
 }
