From 33c8bbd0ce17744aac3b2fdffded04bba350bd7b Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 10 Oct 2023 10:31:28 -0400
Subject: [PATCH] Trim stale capabilities from the profiles gRPC service

---
 .../textsecuregcm/grpc/ProfileGrpcHelper.java |  6 ----
 .../main/proto/org/signal/chat/profile.proto  | 29 ++-----------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcHelper.java b/service/src/main/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcHelper.java
index 30684afba..db1f6cd92 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcHelper.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcHelper.java
@@ -81,12 +81,6 @@ public class ProfileGrpcHelper {
   @VisibleForTesting
   static UserCapabilities buildUserCapabilities(final org.whispersystems.textsecuregcm.entities.UserCapabilities capabilities) {
     return UserCapabilities.newBuilder()
-        .setGv1Migration(capabilities.gv1Migration())
-        .setSenderKey(capabilities.senderKey())
-        .setAnnouncementGroup(capabilities.announcementGroup())
-        .setChangeNumber(capabilities.changeNumber())
-        .setStories(capabilities.stories())
-        .setGiftBadges(capabilities.giftBadges())
         .setPaymentActivation(capabilities.paymentActivation())
         .setPni(capabilities.pni())
         .build();
diff --git a/service/src/main/proto/org/signal/chat/profile.proto b/service/src/main/proto/org/signal/chat/profile.proto
index d9260b588..504e8807c 100644
--- a/service/src/main/proto/org/signal/chat/profile.proto
+++ b/service/src/main/proto/org/signal/chat/profile.proto
@@ -302,39 +302,14 @@ message ProfileAvatarUploadAttributes {
 }
 
 message UserCapabilities {
-  /**
-   * Whether all devices linked to the account support the groups v1 migration.
-   */
-  bool gv1_migration = 1;
-  /**
-   * Whether all devices linked to the account support sender keys.
-   */
-  bool sender_key = 2;
-  /**
-   * Whether all devices linked to the account support announcement groups
-   * (groups where only the admin can send messages or start calls).
-   */
-  bool announcement_group = 3;
-  /**
-   * Whether all devices linked to the account support changing phone number.
-   */
-  bool change_number = 4;
-  /**
-   * Whether all devices linked to the account support stories.
-   */
-  bool stories = 5;
-  /**
-   * Whether all devices linked to the account support gift badges.
-   */
-  bool gift_badges = 6;
   /**
    * Whether all devices linked to the account support MobileCoin payments.
    */
-  bool payment_activation = 7;
+  bool payment_activation = 1;
   /**
    * Whether all devices linked to the account support phone number privacy.
    */
-  bool pni = 8;
+  bool pni = 2;
 }
 
 message Badge {