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

Enable editing of badges on profiles

This commit is contained in:
Ehren Kret 2021-09-17 11:21:33 -05:00
parent c70fa48835
commit 009e2eeb97
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
View File

@ -187,9 +187,13 @@ public class ProfileController {
response = Optional.of(generateAvatarUploadForm(avatar)); response = Optional.of(generateAvatarUploadForm(avatar));
} }
List<AccountBadge> updatedBadges = mergeBadgeIdsWithExistingAccountBadges(
request.getBadges(), auth.getAccount().getBadges());
accountsManager.update(auth.getAccount(), a -> { accountsManager.update(auth.getAccount(), a -> {
a.setProfileName(request.getName()); a.setProfileName(request.getName());
a.setAvatar(avatar); a.setAvatar(avatar);
a.setBadges(clock, updatedBadges);
a.setCurrentProfileVersion(request.getVersion()); a.setCurrentProfileVersion(request.getVersion());
}); });

8
service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
View File

@ -321,6 +321,14 @@ public class Account {
return badges; return badges;
} }
public void setBadges(Clock clock, List<AccountBadge> badges) {
requireNotStale();
this.badges = badges;
purgeStaleBadges(clock);
}
public void addBadge(Clock clock, AccountBadge badge) { public void addBadge(Clock clock, AccountBadge badge) {
requireNotStale(); requireNotStale();