From c0af9111976fd4cc94f862538d0a4e79ffcde517 Mon Sep 17 00:00:00 2001 From: Ehren Kret Date: Fri, 17 Sep 2021 13:25:52 -0500 Subject: [PATCH] Show invisible badges to query for self --- .../textsecuregcm/badges/ConfiguredProfileBadgeConverter.java | 2 +- .../org/whispersystems/textsecuregcm/entities/SelfBadge.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java b/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java index 9862a3f3b..d252829e1 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java @@ -94,7 +94,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter { final ResourceBundle resourceBundle = resourceBundleFactory.createBundle(BASE_NAME, desiredLocale, control); List badges = accountBadges.stream() - .filter(accountBadge -> accountBadge.isVisible() + .filter(accountBadge -> (isSelf || accountBadge.isVisible()) && now.isBefore(accountBadge.getExpiration()) && knownBadges.containsKey(accountBadge.getId())) .map(accountBadge -> { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/SelfBadge.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/SelfBadge.java index 891d5f815..00778663b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/SelfBadge.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/SelfBadge.java @@ -19,7 +19,6 @@ public class SelfBadge extends Badge { private final boolean visible; @JsonCreator - public SelfBadge( @JsonProperty("id") final String id, @JsonProperty("category") final String category,