From 0ac2ce5e72ddb0e3dd6580ff2d29e5a55e01c91a Mon Sep 17 00:00:00 2001 From: Ehren Kret Date: Thu, 28 Apr 2022 22:52:27 -0500 Subject: [PATCH] Add gift badge to the level output for boost badges --- .../textsecuregcm/controllers/SubscriptionController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java index ba14dd7eb..8a5543964 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java @@ -462,9 +462,12 @@ public class SubscriptionController { return CompletableFuture.supplyAsync(() -> { long boostLevel = boostConfiguration.getLevel(); String boostBadge = boostConfiguration.getBadge(); + long giftLevel = giftConfiguration.level(); + String giftBadge = giftConfiguration.badge(); List acceptableLanguages = getAcceptableLanguagesForRequest(containerRequestContext); - GetBoostBadgesResponse getBoostBadgesResponse = new GetBoostBadgesResponse(Map.of(boostLevel, - new GetBoostBadgesResponse.Level(badgeTranslator.translate(acceptableLanguages, boostBadge)))); + GetBoostBadgesResponse getBoostBadgesResponse = new GetBoostBadgesResponse(Map.of( + boostLevel, new GetBoostBadgesResponse.Level(badgeTranslator.translate(acceptableLanguages, boostBadge)), + giftLevel, new GetBoostBadgesResponse.Level(badgeTranslator.translate(acceptableLanguages, giftBadge)))); return Response.ok(getBoostBadgesResponse).build(); }); }