MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct timestamp resolution to intended integer value

This commit is contained in:
Ehren Kret 2023-06-29 15:50:38 -05:00
parent fb39b2edaf
commit 859f646c55
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/entities/PurchasableBadge.java
View File

@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonFormat.Shape; import com.fasterxml.jackson.annotation.JsonFormat.Shape;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import java.time.Duration; import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -27,7 +28,7 @@ public class PurchasableBadge extends Badge {
@JsonProperty("svgs") final List<BadgeSvg> svgs, @JsonProperty("svgs") final List<BadgeSvg> svgs,
@JsonProperty("duration") final Duration duration) { @JsonProperty("duration") final Duration duration) {
super(id, category, name, description, sprites6, svg, svgs); super(id, category, name, description, sprites6, svg, svgs);
this.duration = duration; this.duration = duration != null ? duration.truncatedTo(ChronoUnit.SECONDS) : null;
} }
public PurchasableBadge(final Badge badge, final Duration duration) { public PurchasableBadge(final Badge badge, final Duration duration) {
@ -39,7 +40,7 @@ public class PurchasableBadge extends Badge {
badge.getSprites6(), badge.getSprites6(),
badge.getSvg(), badge.getSvg(),
badge.getSvgs()); badge.getSvgs());
this.duration = duration; this.duration = duration != null ? duration.truncatedTo(ChronoUnit.SECONDS) : null;
} }
@JsonFormat(shape = Shape.NUMBER_INT) @JsonFormat(shape = Shape.NUMBER_INT)

3
service/src/main/java/org/whispersystems/textsecuregcm/entities/UserRemoteConfigList.java
View File

@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List; import java.util.List;
public class UserRemoteConfigList { public class UserRemoteConfigList {
@ -24,7 +25,7 @@ public class UserRemoteConfigList {
public UserRemoteConfigList(List<UserRemoteConfig> config, Instant serverEpochTime) { public UserRemoteConfigList(List<UserRemoteConfig> config, Instant serverEpochTime) {
this.config = config; this.config = config;
this.serverEpochTime = serverEpochTime; this.serverEpochTime = serverEpochTime != null ? serverEpochTime.truncatedTo(ChronoUnit.SECONDS) : null;
} }
public List<UserRemoteConfig> getConfig() { public List<UserRemoteConfig> getConfig() {