signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Clean up new group info message events

Browse Source
This commit is contained in:
Harry 2024-05-16 14:11:32 -07:00 committed by GitHub
parent bcfd4c51a8
commit 96ffe02d8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/translations/en.lproj/Localizable.strings
View File

@ -3122,7 +3122,7 @@
"GROUP_LINK_VIEW_TITLE" = "Group Link";
/* Message indicating that the local user was added to the group by another user. Embeds {{remote user name}}. */
"GROUP_LOCAL_USER_ADDED_TO_GROUP_BY_REMOTE_USER_FORMAT" = "%@ added you.";
"GROUP_LOCAL_USER_ADDED_TO_GROUP_BY_REMOTE_USER_FORMAT" = "%@ added you to the group.";
/* Message indicating that the local user was granted administrator role. */
"GROUP_LOCAL_USER_GRANTED_ADMINISTRATOR" = "You are now an admin.";

26
SignalServiceKit/Messages/Interactions/TSInfoMessage+GroupUpdateItemBuilder.swift
View File

@ -964,16 +964,18 @@ private struct NewGroupUpdateItemBuilder {
items.append(contentsOf: groupInsertedUpdateItems)
// Skip update items for things like name, avatar, current members. Do
// add update items for the current disappearing messages state. We can
// use unknown attribution here – either we created the group (so it was
// add update items for the current disappearing messages state if we have one.
// We can use unknown attribution here – either we created the group (so it was
// us who set the time) or someone else did (so we don't know who set
// the timer), and unknown attribution is always safe.
DiffingGroupUpdateItemBuilder.disappearingMessageUpdateItem(
groupUpdateSource: groupUpdateSource,
oldToken: nil,
newToken: newDisappearingMessageToken,
forceUnknownAttribution: true
).map { items.append($0) }
if newDisappearingMessageToken?.isEnabled == true {
DiffingGroupUpdateItemBuilder.disappearingMessageUpdateItem(
groupUpdateSource: groupUpdateSource,
oldToken: nil,
newToken: newDisappearingMessageToken,
forceUnknownAttribution: true
).map { items.append($0) }
}
if items.contains(where: { if case .createdByLocalUser = $0 { return true } ; return false }) {
// If we just created the group, add an update item to let users
@ -1062,10 +1064,10 @@ private struct NewGroupUpdateItemBuilder {
switch groupUpdateSource {
case .localUser:
return .createdByLocalUser
case let .aci(updaterAci):
return .createdByOtherUser(updaterAci: updaterAci.codableUuid)
case .rejectedInviteToPni, .legacyE164, .unknown:
return .createdByUnknownUser
case .aci, .rejectedInviteToPni, .legacyE164, .unknown:
// Don't show when others created the group,
// just when the local user does.
return nil
}
}
return nil