mirror of https://github.com/oxen-io/session-ios
Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts: # LibSession-Util # Podfile # Podfile.lock # Session.xcodeproj/project.pbxproj # Session.xcodeproj/xcshareddata/xcschemes/SessionSnodeKit.xcscheme # Session/Calls/Call Management/SessionCallManager.swift # Session/Closed Groups/EditClosedGroupVC.swift # Session/Closed Groups/NewClosedGroupVC.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Home/New Conversation/NewDMVC.swift # Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift # Session/Meta/AppDelegate.swift # Session/Meta/SessionApp.swift # Session/Notifications/SyncPushTokensJob.swift # Session/Notifications/UserNotificationsAdaptee.swift # Session/Onboarding/Onboarding.swift # Session/Path/PathStatusView.swift # Session/Path/PathVC.swift # Session/Settings/NukeDataModal.swift # Session/Utilities/BackgroundPoller.swift # Session/Utilities/IP2Country.swift # SessionMessagingKit/Database/Migrations/_014_GenerateInitialUserConfigDumps.swift # SessionMessagingKit/Database/Migrations/_015_BlockCommunityMessageRequests.swift # SessionMessagingKit/Database/Migrations/_018_DisappearingMessagesConfiguration.swift # SessionMessagingKit/Database/Models/Attachment.swift # SessionMessagingKit/Database/Models/ClosedGroup.swift # SessionMessagingKit/Database/Models/ConfigDump.swift # SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift # SessionMessagingKit/Database/Models/Interaction.swift # SessionMessagingKit/Database/Models/SessionThread.swift # SessionMessagingKit/File Server/FileServerAPI.swift # SessionMessagingKit/Jobs/AttachmentDownloadJob.swift # SessionMessagingKit/Jobs/ConfigMessageReceiveJob.swift # SessionMessagingKit/Jobs/ConfigurationSyncJob.swift # SessionMessagingKit/Jobs/ExpirationUpdateJob.swift # SessionMessagingKit/Jobs/GetExpirationJob.swift # SessionMessagingKit/Jobs/MessageSendJob.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+ConvoInfoVolatile.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+UserGroups.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift # SessionMessagingKit/LibSession/Config Handling/SessionUtil+GroupInfo.swift # SessionMessagingKit/LibSession/Config Handling/SessionUtil+GroupKeys.swift # SessionMessagingKit/LibSession/Config Handling/SessionUtil+GroupMembers.swift # SessionMessagingKit/LibSession/Config Handling/SessionUtil+SharedGroup.swift # SessionMessagingKit/LibSession/Database/QueryInterfaceRequest+Utilities.swift # SessionMessagingKit/LibSession/Database/Setting+Utilities.swift # SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift # SessionMessagingKit/Messages/Message+Origin.swift # SessionMessagingKit/Messages/Message.swift # SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift # SessionMessagingKit/Open Groups/Models/SOGSMessage.swift # SessionMessagingKit/Open Groups/OpenGroupAPI.swift # SessionMessagingKit/Open Groups/OpenGroupManager.swift # SessionMessagingKit/Open Groups/OpenGroupServerIdLookup.swift # SessionMessagingKit/Open Groups/Types/Request+OpenGroupAPI.swift # SessionMessagingKit/Open Groups/Types/SOGSEndpoint.swift # SessionMessagingKit/Protos/Generated/SNProto.swift # SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift # SessionMessagingKit/Protos/SessionProtos.proto # SessionMessagingKit/Sending & Receiving/Errors/MessageSenderError.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver.swift # SessionMessagingKit/Sending & Receiving/MessageSender.swift # SessionMessagingKit/Sending & Receiving/Notifications/Models/PushNotificationAPIRequest.swift # SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift # SessionMessagingKit/Sending & Receiving/Notifications/Types/Request+PushNotificationAPI.swift # SessionMessagingKit/Sending & Receiving/Pollers/CurrentUserPoller.swift # SessionMessagingKit/Sending & Receiving/Pollers/GroupPoller.swift # SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupAPI+Poller.swift # SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift # SessionMessagingKit/SessionUtil/SessionUtilError.swift # SessionMessagingKit/SessionUtil/Utilities/TypeConversion+Utilities.swift # SessionMessagingKit/Shared Models/MessageViewModel.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionMessagingKit/Utilities/ProfileManager.swift # SessionMessagingKitTests/LibSession/LibSessionSpec.swift # SessionMessagingKitTests/LibSession/LibSessionUtilSpec.swift # SessionMessagingKitTests/Open Groups/Models/SOGSMessageSpec.swift # SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift # SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift # SessionNotificationServiceExtension/NotificationServiceExtension.swift # SessionShareExtension/ShareNavController.swift # SessionShareExtension/ThreadPickerVC.swift # SessionSnodeKit/Configuration.swift # SessionSnodeKit/Database/Migrations/_001_InitialSetupMigration.swift # SessionSnodeKit/Database/Models/Snode.swift # SessionSnodeKit/Database/Models/SnodeReceivedMessageInfo.swift # SessionSnodeKit/Database/Models/SnodeSet.swift # SessionSnodeKit/Jobs/GetSnodePoolJob.swift # SessionSnodeKit/Models/DeleteAllBeforeRequest.swift # SessionSnodeKit/Models/DeleteAllMessagesRequest.swift # SessionSnodeKit/Models/DeleteMessagesRequest.swift # SessionSnodeKit/Models/GetExpiriesRequest.swift # SessionSnodeKit/Models/GetMessagesRequest.swift # SessionSnodeKit/Models/ONSResolveResponse.swift # SessionSnodeKit/Models/RevokeSubkeyRequest.swift # SessionSnodeKit/Models/SendMessageRequest.swift # SessionSnodeKit/Models/SnodeAuthenticatedRequestBody.swift # SessionSnodeKit/Models/SnodeRequest.swift # SessionSnodeKit/Models/SwarmSnode.swift # SessionSnodeKit/Models/UpdateExpiryAllRequest.swift # SessionSnodeKit/Models/UpdateExpiryRequest.swift # SessionSnodeKit/Networking/OnionRequestAPI.swift # SessionSnodeKit/Networking/PreparedRequest+OnionRequest.swift # SessionSnodeKit/Networking/Request+SnodeAPI.swift # SessionSnodeKit/Networking/SnodeAPI.swift # SessionSnodeKit/Types/OnionRequestAPIError.swift # SessionSnodeKit/Types/SnodeAPIEndpoint.swift # SessionSnodeKit/Types/SnodeAPIError.swift # SessionSnodeKit/Types/SnodeAPINamespace.swift # SessionSnodeKit/Types/SwarmDrainBehaviour.swift # SessionSnodeKitTests/Models/SnodeRequestSpec.swift # SessionTests/Database/DatabaseSpec.swift # SessionUIKit/Style Guide/Values.swift # SessionUtilitiesKit/Database/Migrations/_005_AddJobUniqueHash.swift # SessionUtilitiesKit/Database/Models/Job.swift # SessionUtilitiesKit/Database/Types/Migration.swift # SessionUtilitiesKit/General/Data+Utilities.swift # SessionUtilitiesKit/General/Dependencies.swift # SessionUtilitiesKit/General/Features.swift # SessionUtilitiesKit/General/Logging.swift # SessionUtilitiesKit/JobRunner/JobRunner.swift # SessionUtilitiesKit/LibSession/Utilities/Crypto+SessionUtil.swift # SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift # SessionUtilitiesKit/Networking/BatchRequest.swift # SessionUtilitiesKit/Networking/BatchResponse.swift # SessionUtilitiesKit/Networking/HTTP.swift # SessionUtilitiesKit/Networking/HTTPError.swift # SessionUtilitiesKit/Networking/PreparedRequest.swift # SessionUtilitiesKit/Networking/Request.swift # SessionUtilitiesKit/Networking/RequestTarget.swift # SessionUtilitiesKit/SessionUtil/Utilities/TypeConversion+Utilities.swift # SessionUtilitiesKit/Utilities/Bencode.swift # SessionUtilitiesKit/Utilities/JSONEncoder+Utilities.swift # SessionUtilitiesKitTests/JobRunner/JobRunnerSpec.swift # SessionUtilitiesKitTests/Networking/BatchRequestSpec.swift # SessionUtilitiesKitTests/Networking/BatchResponseSpec.swift # SessionUtilitiesKitTests/Networking/PreparedRequestSpec.swift # SessionUtilitiesKitTests/Networking/RequestSpec.swift # SessionUtilitiesKitTests/Utilities/BencodeResponseSpec.swift # SignalUtilitiesKit/Configuration.swift # SignalUtilitiesKit/Utilities/AppSetup.swift # SignalUtilitiesKit/Utilities/Bench.swift # SignalUtilitiesKit/Utilities/UIGestureRecognizer+OWS.swift # _SharedTestUtilities/CommonMockedExtensions.swift # _SharedTestUtilities/MockJobRunner.swift # _SharedTestUtilities/Mocked.swiftpull/894/head
Morgan Pretty
10 months ago
commit
8500e1f602
@ -1 +1 @@
|
||||
Subproject commit 343cd41bb713cc6522b04e39e929b11b80d81f22
|
||||
Subproject commit b66e54b25805a3edbf5c09fafa2c486b18766383
|
||||
@ -0,0 +1,59 @@
|
||||
# Xcode simulator keepalive/cleanup
|
||||
|
||||
Keep-alive directory for simulators managed by xcode that may be created during
|
||||
drone CI jobs.
|
||||
|
||||
These scripts are placed in a /Users/$USER/sim-keepalive directory; keepalive.sh
|
||||
is called from a CI job to set up a keepalive, while cleanup.py is intended to
|
||||
be run once/minute via cron to deal with cleaning up old simulators from killed
|
||||
CI pipelines.
|
||||
|
||||
The directory itself will have files created that look like a UDID and are
|
||||
checked periodically (by cleanup.py); any that have a timestamp less than the
|
||||
current time will be deleted.
|
||||
|
||||
## Simple timeout
|
||||
|
||||
A CI job can invoke the keepalive.sh script with a UDID value and a time
|
||||
interval: the keepalive script will set up a file that will keep the simulator
|
||||
alive for the given interval, then deletes it once the interval is passed. The
|
||||
script exits immediately in this mode. Shortly (up to a minute) after the
|
||||
timestamp is reached the simulator device will be deleted (if it still exists).
|
||||
For example:
|
||||
|
||||
/Users/$USER/sim-keepalive/keepalive.sh $udid "5 minutes"
|
||||
|
||||
for a fixed 5-minute cleanup timeout.
|
||||
|
||||
## Indefinite timeout
|
||||
|
||||
For a job where the precise time required isn't known or varies significantly
|
||||
there is a script in this directory that provides a simple keep-alive script
|
||||
that will create and periodically update the $udid file to keep the simulator
|
||||
alive.
|
||||
|
||||
This is moderately more complex to set up as you must add a parallel job (using
|
||||
`depends_on`) to the CI pipeline that runs the script for the duration of the
|
||||
steps that require the simulator:
|
||||
|
||||
/Users/$USER/sim-keepalive/keepalive.sh $udid
|
||||
|
||||
the script periodically touches the sim-keepalive/$udid to keep the simulator
|
||||
alive as long as the keep alive script runs. To stop the keepalive (i.e. when
|
||||
the task is done) simply run:
|
||||
|
||||
rm /Users/$USER/sim-keepalive/$udid
|
||||
|
||||
which will cause the keepalive script to immediately shut down the simulator
|
||||
with the given UDID and then exits the keepalive script.
|
||||
|
||||
If the pipeline gets killed, the keepalive script stops updating the file and
|
||||
the simulator will be killed by the periodic cleanup within the next couple
|
||||
minutes.
|
||||
|
||||
# crontab entry
|
||||
|
||||
A crontab entry must be added to run the CI user's crontab to periodically run
|
||||
cleanup.py:
|
||||
|
||||
* * * * * ~/sim-keepalive/cleanup.py
|
||||
@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import shutil
|
||||
import time
|
||||
import json
|
||||
|
||||
os.chdir(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
subprocess.run(["xcrun", "simctl", "delete", "unavailable"], check=True)
|
||||
|
||||
simctl_list = json.loads(subprocess.run(["xcrun", "simctl", "list", "devices", "-je"], check=True, stdout=subprocess.PIPE).stdout)
|
||||
|
||||
now = time.time()
|
||||
|
||||
for rt, devs in simctl_list.get("devices", {}).items():
|
||||
for dev in devs:
|
||||
udid = dev["udid"]
|
||||
nuke_it = False
|
||||
if os.path.isfile(udid):
|
||||
if os.path.getmtime(udid) <= now:
|
||||
nuke_it = True
|
||||
os.remove(udid)
|
||||
# else the keepalive file is still active
|
||||
elif os.path.getmtime(dev["dataPath"]) <= now - 3600:
|
||||
# no keep-alive and more than an hour old so kill it
|
||||
nuke_it = True
|
||||
|
||||
if nuke_it:
|
||||
subprocess.run(["xcrun", "simctl", "delete", udid])
|
||||
if os.path.exists(dev["logPath"]):
|
||||
shutil.rmtree(dev["logPath"])
|
||||
@ -0,0 +1,82 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
if ! [[ "$1" =~ ^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$ ]]; then
|
||||
echo "Error: expected single UDID argument. Usage: $0 XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
UDID=$1
|
||||
|
||||
cd $(gdirname $(greadlink -f $0))
|
||||
|
||||
reset="\e[0m"
|
||||
red="\e[31;1m"
|
||||
green="\e[32;1m"
|
||||
yellow="\e[33;1m"
|
||||
blue="\e[34;1m"
|
||||
cyan="\e[36;1m"
|
||||
|
||||
if [ -n "$2" ]; then
|
||||
gtouch --date "$2" $UDID
|
||||
|
||||
echo -e "\n${green}Started a $2 one-shot cleanup timer for device $cyan$UDID${reset}"
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo -e "\n${green}Starting keep-alive for device $cyan$UDID${reset}"
|
||||
|
||||
gtouch --date '30 seconds' $UDID
|
||||
last_print=0
|
||||
last_touch=$EPOCHSECONDS
|
||||
started=$EPOCHSECONDS
|
||||
|
||||
function print_state() {
|
||||
if ! xcrun simctl list -je devices $UDID |
|
||||
jq -er '.devices[][] | "Current state: \u001b[32;1m" + .state + " \u001b[34m(" + .name + ", \u001b[35m" + .deviceTypeIdentifier + ", \u001b[36m" + .udid + "\u001b[34m)\u001b[0m"'; then
|
||||
echo -e "Current state: $cyan$UDID ${red}not found$reset"
|
||||
fi
|
||||
}
|
||||
|
||||
while true; do
|
||||
if [[ $EPOCHSECONDS -gt $((last_touch + 10)) ]]; then
|
||||
last_touch=$EPOCHSECONDS
|
||||
gtouch --no-create --date '30 seconds' $UDID
|
||||
fi
|
||||
|
||||
if [ ! -f $UDID ]; then
|
||||
echo -e "$cyan$UDID ${yellow}keep-alive file vanished${reset}"
|
||||
if xcrun simctl list -je devices $UDID | jq -e "any(.devices.[][]; .)" >/dev/null; then
|
||||
logdir="$(xcrun simctl list devices -je $UDID | jq '.devices[][0].logPath')"
|
||||
echo -e "$blue ... shutting down device${reset}"
|
||||
xcrun simctl shutdown $UDID
|
||||
print_state
|
||||
echo -e "$blue ... deleting device${reset}"
|
||||
xcrun simctl delete $UDID
|
||||
print_state
|
||||
if [ "$logdir" != "null" ] && [ -d "$logdir" ]; then
|
||||
echo -e "$blue ... deleting log directory $logdir${reset}"
|
||||
rm -rf "$logdir"
|
||||
fi
|
||||
|
||||
else
|
||||
echo -e "\n${yellow}Device ${cyan}$UDID${yellow} no longer exists!${reset}"
|
||||
fi
|
||||
|
||||
echo -e "\n${green}All done.${reset}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ $EPOCHSECONDS -gt $((last_print + 30)) ]]; then
|
||||
last_print=$EPOCHSECONDS
|
||||
print_state
|
||||
fi
|
||||
|
||||
if [[ $EPOCHSECONDS -gt $((started + 7200)) ]]; then
|
||||
echo -e "${red}2-hour timeout reached; exiting to allow cleanup${reset}"
|
||||
fi
|
||||
|
||||
sleep 0.5
|
||||
done
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,178 @@
|
||||
// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import UIKit
|
||||
import SessionUIKit
|
||||
|
||||
class MessageRequestFooterView: UIView {
|
||||
private var onBlock: (() -> ())?
|
||||
private var onAccept: (() -> ())?
|
||||
private var onDecline: (() -> ())?
|
||||
|
||||
// MARK: - UI
|
||||
|
||||
var messageRequestDescriptionLabelBottomConstraint: NSLayoutConstraint?
|
||||
|
||||
lazy var stackView: UIStackView = {
|
||||
let result: UIStackView = UIStackView()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.axis = .vertical
|
||||
result.alignment = .fill
|
||||
result.distribution = .fill
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var descriptionContainerView: UIView = {
|
||||
let result: UIView = UIView()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var descriptionLabel: UILabel = {
|
||||
let result: UILabel = UILabel()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.setContentCompressionResistancePriority(.required, for: .vertical)
|
||||
result.font = UIFont.systemFont(ofSize: 12)
|
||||
result.themeTextColor = .textSecondary
|
||||
result.textAlignment = .center
|
||||
result.numberOfLines = 0
|
||||
result.accessibilityIdentifier = "Control message"
|
||||
result.isAccessibilityElement = true
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var actionStackView: UIStackView = {
|
||||
let result: UIStackView = UIStackView()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.axis = .horizontal
|
||||
result.alignment = .fill
|
||||
result.distribution = .fill
|
||||
result.spacing = (UIDevice.current.isIPad ? Values.iPadButtonSpacing : 20)
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var blockButton: UIButton = {
|
||||
let result: UIButton = UIButton()
|
||||
result.setCompressionResistanceHigh()
|
||||
result.accessibilityLabel = "Block message request"
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.clipsToBounds = true
|
||||
result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)
|
||||
result.setTitle("TXT_BLOCK_USER_TITLE".localized(), for: .normal)
|
||||
result.setThemeTitleColor(.danger, for: .normal)
|
||||
result.addTarget(self, action: #selector(block), for: .touchUpInside)
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var acceptButton: UIButton = {
|
||||
let result: SessionButton = SessionButton(style: .bordered, size: .medium)
|
||||
result.accessibilityLabel = "Accept message request"
|
||||
result.isAccessibilityElement = true
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.setTitle("TXT_DELETE_ACCEPT".localized(), for: .normal)
|
||||
result.addTarget(self, action: #selector(accept), for: .touchUpInside)
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var declineButton: UIButton = {
|
||||
let result: SessionButton = SessionButton(style: .destructive, size: .medium)
|
||||
result.accessibilityLabel = "Delete message request"
|
||||
result.isAccessibilityElement = true
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.setTitle("TXT_DELETE_TITLE".localized(), for: .normal)
|
||||
result.addTarget(self, action: #selector(decline), for: .touchUpInside)
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init(
|
||||
threadVariant: SessionThread.Variant,
|
||||
canWrite: Bool,
|
||||
threadIsMessageRequest: Bool,
|
||||
threadRequiresApproval: Bool,
|
||||
onBlock: @escaping () -> (),
|
||||
onAccept: @escaping () -> (),
|
||||
onDecline: @escaping () -> ()
|
||||
) {
|
||||
super.init(frame: .zero)
|
||||
|
||||
self.onBlock = onBlock
|
||||
self.onAccept = onAccept
|
||||
self.onDecline = onDecline
|
||||
self.themeBackgroundColor = .backgroundPrimary
|
||||
|
||||
update(
|
||||
threadVariant: threadVariant,
|
||||
canWrite: canWrite,
|
||||
threadIsMessageRequest: threadIsMessageRequest,
|
||||
threadRequiresApproval: threadRequiresApproval
|
||||
)
|
||||
setupLayout()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Layout
|
||||
|
||||
private func setupLayout() {
|
||||
addSubview(stackView)
|
||||
stackView.addArrangedSubview(blockButton)
|
||||
stackView.addArrangedSubview(descriptionContainerView)
|
||||
stackView.addArrangedSubview(actionStackView)
|
||||
|
||||
descriptionContainerView.addSubview(descriptionLabel)
|
||||
actionStackView.addArrangedSubview(acceptButton)
|
||||
actionStackView.addArrangedSubview(declineButton)
|
||||
|
||||
stackView.pin(.top, to: .top, of: self, withInset: 16)
|
||||
stackView.pin(.leading, to: .leading, of: self, withInset: 16)
|
||||
stackView.pin(.trailing, to: .trailing, of: self, withInset: -16)
|
||||
stackView.pin(.bottom, to: .bottom, of: self, withInset: -16)
|
||||
|
||||
descriptionLabel.pin(.top, to: .top, of: descriptionContainerView, withInset: 4)
|
||||
descriptionLabel.pin(.leading, to: .leading, of: descriptionContainerView, withInset: 20)
|
||||
descriptionLabel.pin(.trailing, to: .trailing, of: descriptionContainerView, withInset: -20)
|
||||
messageRequestDescriptionLabelBottomConstraint = descriptionLabel.pin(.bottom, to: .bottom, of: descriptionContainerView, withInset: -20)
|
||||
actionStackView.pin(.top, to: .bottom, of: descriptionContainerView)
|
||||
|
||||
declineButton.set(.width, to: .width, of: acceptButton)
|
||||
}
|
||||
|
||||
// MARK: - Content
|
||||
|
||||
func update(
|
||||
threadVariant: SessionThread.Variant,
|
||||
canWrite: Bool,
|
||||
threadIsMessageRequest: Bool,
|
||||
threadRequiresApproval: Bool
|
||||
) {
|
||||
self.isHidden = (!canWrite || (!threadIsMessageRequest && !threadRequiresApproval))
|
||||
self.blockButton.isHidden = (
|
||||
threadVariant != .contact ||
|
||||
threadRequiresApproval
|
||||
)
|
||||
switch (threadVariant, threadRequiresApproval) {
|
||||
case (.contact, false): self.descriptionLabel.text = "MESSAGE_REQUESTS_INFO".localized()
|
||||
case (.contact, true): self.descriptionLabel.text = "MESSAGE_REQUEST_PENDING_APPROVAL_INFO".localized()
|
||||
case (.group, _): self.descriptionLabel.text = "GROUP_MESSAGE_REQUEST_INFO".localized()
|
||||
default: break
|
||||
}
|
||||
self.actionStackView.isHidden = threadRequiresApproval
|
||||
self.messageRequestDescriptionLabelBottomConstraint?.constant = (threadRequiresApproval ? -4 : -20)
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
@objc private func block() { onBlock?() }
|
||||
@objc private func accept() { onAccept?() }
|
||||
@objc private func decline() { onDecline?() }
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEDTCCAvWgAwIBAgIUPwyEuBgX6kfxt+G2tQ4GNTZErMMwDQYJKoZIhvcNAQEL
|
||||
BQAwejELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3RvcmlhMRIwEAYDVQQHDAlN
|
||||
ZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNoIEZvdW5kYXRpb24x
|
||||
HTAbBgNVBAMMFHNlZWQxLmdldHNlc3Npb24ub3JnMB4XDTIzMDQxMjEyNTYyMloX
|
||||
DTI1MDQxMTEyNTYyMlowejELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3Rvcmlh
|
||||
MRIwEAYDVQQHDAlNZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNo
|
||||
IEZvdW5kYXRpb24xHTAbBgNVBAMMFHNlZWQxLmdldHNlc3Npb24ub3JnMIIBIjAN
|
||||
BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxkbApgfFA1upIFj47y+7k+qrM0l
|
||||
MLDvtX3U95icVgb7HGhxKzkzbCOscKZnVsq1N90drYVh7to0H69b2t6y7l+9q6Zd
|
||||
Ytzi9U0NoL/OabmR6F+w/XpokRM7CMz9zeg84VLnyu2yRdR26keG4/AZRXk+j8Dy
|
||||
6xp09+hTF7kfdfzL3HdYyUsyx+/CqoyzU01yn4aVgJ9aufYu38QKnnjfROiVahJf
|
||||
Xm1MvHLmDCe+WbDFgsp2Y0NjNbpASUgrOEPNnIJeY3Lw4kzwNVGsbSBHgvLgSfaD
|
||||
p5L6k89TUUKA0onlGFAN/MDXL4DNfjSpmfzHyhM8XwKJ9COSXsvvpX5hHQIDAQAB
|
||||
o4GKMIGHMB0GA1UdDgQWBBRypjuvZ+5vWDB4kcKE9MkFrVp0tzAfBgNVHSMEGDAW
|
||||
gBRypjuvZ+5vWDB4kcKE9MkFrVp0tzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdEQQY
|
||||
MBaCFHNlZWQxLmdldHNlc3Npb24ub3JnMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0G
|
||||
CSqGSIb3DQEBCwUAA4IBAQBW8q3DzJWVXZew9pJ1MqjqsMuNt2OlnptwIZUme/Lh
|
||||
krhqBj5o87218542ao1Hkgph4IuuwEQPwJvUoUbh7dT/k+4D6Ua3oUxhmdeyFUv+
|
||||
mjQKZ1mfcfrwW+6rCWJRa2mAVYfOhdfBQZgLP7NqYdskVQF5LWXSs1IF3XLTyROy
|
||||
gCeapTexTvKlr/TMW4spE4ewaQ4AfB2c24iVLcpAWT+12GaJ0AYO+gY2o7LQqywN
|
||||
qIxt2mbvXyf2wuhr489tmGz53mKa3Xu7JC1uU6g9zqJ4FGMYsI8pa0Ec2ODRBb8s
|
||||
8W54r5LN472aTYn+UGgV8wadzPFd0FZtQABkDTuWSZY7
|
||||
-----END CERTIFICATE-----
|
||||
Binary file not shown.
@ -1,24 +0,0 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEDTCCAvWgAwIBAgIUaPiMYcZh7cZZfacCni2NwT5DKh4wDQYJKoZIhvcNAQEL
|
||||
BQAwejELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3RvcmlhMRIwEAYDVQQHDAlN
|
||||
ZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNoIEZvdW5kYXRpb24x
|
||||
HTAbBgNVBAMMFHNlZWQyLmdldHNlc3Npb24ub3JnMB4XDTIzMDQxMjEyNTY0NVoX
|
||||
DTI1MDQxMTEyNTY0NVowejELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3Rvcmlh
|
||||
MRIwEAYDVQQHDAlNZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNo
|
||||
IEZvdW5kYXRpb24xHTAbBgNVBAMMFHNlZWQyLmdldHNlc3Npb24ub3JnMIIBIjAN
|
||||
BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh2UcfW0I+1QWRa3cj7RnMGelYkGK
|
||||
7l4V6q7je1IkudXBNretkvVF1NCpfZ8dz72JmdGPJ5/uIEW15HDD2L63OmSDVPhA
|
||||
2JCb/NqmXfeO91lyxgb0sDnN1UH0wzuS75aBjaQ0nXQV3ffmqKnNNv0HK+LTMFD+
|
||||
Dv2yGDtZTWH6H3VzPLCvHHYXVdyuQHwchAcNQar5k4dbdEIcYIV+ANccPg7iQ81a
|
||||
ITZ9bCeACdMqbB9gILq21KWdkxCu1fwSXs/B6n+U4UpJyv87fprvAyU3HqQhqlU7
|
||||
dHnzA1dPn8D4a/3CMYZogVm8USNjv4HmWIwKbYDX+VahvuZwEi6+pwEurQIDAQAB
|
||||
o4GKMIGHMB0GA1UdDgQWBBRxVM4+gFFipZFAg+Fs4x580js+2TAfBgNVHSMEGDAW
|
||||
gBRxVM4+gFFipZFAg+Fs4x580js+2TAPBgNVHRMBAf8EBTADAQH/MB8GA1UdEQQY
|
||||
MBaCFHNlZWQyLmdldHNlc3Npb24ub3JnMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0G
|
||||
CSqGSIb3DQEBCwUAA4IBAQBIFj6hsOgNVr2kZufimTxoT1TE8uvycIWyt04q6/nP
|
||||
8h33u/sHuNPdnr2UewqRyDRFefxrGlqBUQAQJVyzJGIlju/HTZaBnVB0H2smCRtK
|
||||
ZRHAJ/cwcnAp+STjqgPqt1ZZ6JcfFwJZID4pPmrW8WaQNAtQPi2Ly2JLQ+Ym5wus
|
||||
aGxGjbDRQSWGmUpg5TE+XdDsHeJtCl6HAEjvtXfq1uzKedRzmqYfIa8Rd7b2tmuy
|
||||
dN27swR4DRJOK4rAxHnI8jt7GKVtPXnYfRuk2+0dVZ4CD6qHw+CO5mcdCabnflgT
|
||||
XS8BYlOvkAyVbtmZNAacoUZvPRx3o186BMJoK2coQyFN
|
||||
-----END CERTIFICATE-----
|
||||
Binary file not shown.
@ -1,24 +0,0 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEDTCCAvWgAwIBAgIUEZkKsCM3Leodz+JB0ADefbWoRbswDQYJKoZIhvcNAQEL
|
||||
BQAwejELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3RvcmlhMRIwEAYDVQQHDAlN
|
||||
ZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNoIEZvdW5kYXRpb24x
|
||||
HTAbBgNVBAMMFHNlZWQzLmdldHNlc3Npb24ub3JnMB4XDTIzMDUxNzAyNDAwOFoX
|
||||
DTI1MDQxMjAyNDAwOFowejELMAkGA1UEBhMCQVUxETAPBgNVBAgMCFZpY3Rvcmlh
|
||||
MRIwEAYDVQQHDAlNZWxib3VybmUxJTAjBgNVBAoMHE94ZW4gUHJpdmFjeSBUZWNo
|
||||
IEZvdW5kYXRpb24xHTAbBgNVBAMMFHNlZWQzLmdldHNlc3Npb24ub3JnMIIBIjAN
|
||||
BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4Yz/kIXn5t+VMATXsortcyK3DFF
|
||||
hjNICxAt8qdLwyCCJDnedBdfeQb7zrn2A3btzfKrBD0x3JrbVHabUrtI+wFqfDLS
|
||||
id2WOIIM/8RP2V/e4zanpKsk9yB/euKga+M+fybfTn1WTqQU5nEuU6eZyyEEZBk6
|
||||
1rzWJstxWhcfN4rfl+ciSWLcmFLC2LuNZqwm6To77oLPj+DGrUHyRKFZ4Tw9ilcU
|
||||
TpMKFaMmNzrHEzS5lPJIRa+2LD5vDYR/sv+lPiKMXTb64OTOJjTfucdsyZqWrI0R
|
||||
mV2pBcrYBoDbxO+7pnr8GrJIcFqTLDI6MbjH6eseZqRHJSYKrNCyGlDeSQIDAQAB
|
||||
o4GKMIGHMB0GA1UdDgQWBBRUYnrMlCbDZo6YXpnivhBui51XhDAfBgNVHSMEGDAW
|
||||
gBRUYnrMlCbDZo6YXpnivhBui51XhDAPBgNVHRMBAf8EBTADAQH/MB8GA1UdEQQY
|
||||
MBaCFHNlZWQzLmdldHNlc3Npb24ub3JnMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0G
|
||||
CSqGSIb3DQEBCwUAA4IBAQBFYRlRODyQTIhNQC+pTapKtHdS9GJqKvyJX6NVFF6w
|
||||
+oBzZGNYsDTmzaelraAuUz+uS7d0vngu5cV+3jG0DgksELT6hbpuHcad1rxAhuDv
|
||||
wv/f02qJyB1F2luXma2n+NHgRFhvIYulWjV/DSSmwea2XD4DH+ZKcYeEXyT71b2T
|
||||
VZfGnxLPVMz99iA6sQxsNfccFMvDxKofha7teRkUJ+SVzyutrneYySqrjGie6+Nb
|
||||
oOw4CnpiqiUKIf47B6ZKlsJ8MAS8zAo6O9UqfmNdVoXFrZDjaQGPAjSH1oxL7iP5
|
||||
pED6BUMytm8spiTEVBYIer/gcXaA4zWSKZ/Fd24OK0GL
|
||||
-----END CERTIFICATE-----
|
||||
Binary file not shown.
@ -0,0 +1,453 @@
|
||||
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import Foundation
|
||||
import GRDB
|
||||
import SessionUtil
|
||||
import SessionSnodeKit
|
||||
import SessionUtilitiesKit
|
||||
|
||||
// MARK: - Size Restrictions
|
||||
|
||||
public extension LibSession {
|
||||
static var sizeMaxGroupDescriptionBytes: Int { GROUP_INFO_DESCRIPTION_MAX_LENGTH }
|
||||
|
||||
static func isTooLong(groupDescription: String) -> Bool {
|
||||
return (groupDescription.utf8CString.count > LibSession.sizeMaxGroupDescriptionBytes)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Group Info Handling
|
||||
|
||||
internal extension LibSession {
|
||||
static let columnsRelatedToGroupInfo: [ColumnExpression] = [
|
||||
ClosedGroup.Columns.name,
|
||||
ClosedGroup.Columns.groupDescription,
|
||||
ClosedGroup.Columns.displayPictureUrl,
|
||||
ClosedGroup.Columns.displayPictureEncryptionKey,
|
||||
DisappearingMessagesConfiguration.Columns.isEnabled,
|
||||
DisappearingMessagesConfiguration.Columns.type,
|
||||
DisappearingMessagesConfiguration.Columns.durationSeconds
|
||||
]
|
||||
|
||||
// MARK: - Incoming Changes
|
||||
|
||||
static func handleGroupInfoUpdate(
|
||||
_ db: Database,
|
||||
in config: Config?,
|
||||
groupSessionId: SessionId,
|
||||
serverTimestampMs: Int64,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
guard config.needsDump(using: dependencies) else { return }
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
// If the group is destroyed then remove the group date (want to keep the group itself around because
|
||||
// the UX of conversations randomly disappearing isn't great) - no other changes matter and this
|
||||
// can't be reversed
|
||||
guard !groups_info_is_destroyed(conf) else {
|
||||
try ClosedGroup.removeData(
|
||||
db,
|
||||
threadIds: [groupSessionId.hexString],
|
||||
dataToRemove: [
|
||||
.poller, .pushNotifications, .messages, .members,
|
||||
.encryptionKeys, .authDetails, .libSessionState
|
||||
],
|
||||
calledFromConfig: .groupInfo,
|
||||
using: dependencies
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
// A group must have a name so if this is null then it's invalid and can be ignored
|
||||
guard let groupNamePtr: UnsafePointer<CChar> = groups_info_get_name(conf) else { return }
|
||||
|
||||
let groupDescPtr: UnsafePointer<CChar>? = groups_info_get_description(conf)
|
||||
let groupName: String = String(cString: groupNamePtr)
|
||||
let groupDesc: String? = groupDescPtr.map { String(cString: $0) }
|
||||
let formationTimestamp: TimeInterval = TimeInterval(groups_info_get_created(conf))
|
||||
|
||||
// The `displayPic.key` can contain junk data so if the `displayPictureUrl` is null then just
|
||||
// set the `displayPictureKey` to null as well
|
||||
let displayPic: user_profile_pic = groups_info_get_pic(conf)
|
||||
let displayPictureUrl: String? = String(libSessionVal: displayPic.url, nullIfEmpty: true)
|
||||
let displayPictureKey: Data? = (displayPictureUrl == nil ? nil :
|
||||
Data(
|
||||
libSessionVal: displayPic.key,
|
||||
count: DisplayPictureManager.aes256KeyByteLength
|
||||
)
|
||||
)
|
||||
|
||||
// Update the group name
|
||||
let existingGroup: ClosedGroup? = try? ClosedGroup
|
||||
.filter(id: groupSessionId.hexString)
|
||||
.fetchOne(db)
|
||||
let needsDisplayPictureUpdate: Bool = (
|
||||
existingGroup?.displayPictureUrl != displayPictureUrl ||
|
||||
existingGroup?.displayPictureEncryptionKey != displayPictureKey
|
||||
)
|
||||
|
||||
let groupChanges: [ConfigColumnAssignment] = [
|
||||
((existingGroup?.name == groupName) ? nil :
|
||||
ClosedGroup.Columns.name.set(to: groupName)
|
||||
),
|
||||
((existingGroup?.groupDescription == groupDesc) ? nil :
|
||||
ClosedGroup.Columns.groupDescription.set(to: groupDesc)
|
||||
),
|
||||
// Only update the 'formationTimestamp' if we don't have one (don't want to override the 'joinedAt'
|
||||
// timestamp with the groups creation timestamp
|
||||
(formationTimestamp < (existingGroup?.formationTimestamp ?? 0) ? nil :
|
||||
ClosedGroup.Columns.formationTimestamp.set(to: formationTimestamp)
|
||||
),
|
||||
// If we are removing the display picture do so here
|
||||
(!needsDisplayPictureUpdate || displayPictureUrl != nil ? nil :
|
||||
ClosedGroup.Columns.displayPictureUrl.set(to: nil)
|
||||
),
|
||||
(!needsDisplayPictureUpdate || displayPictureUrl != nil ? nil :
|
||||
ClosedGroup.Columns.displayPictureFilename.set(to: nil)
|
||||
),
|
||||
(!needsDisplayPictureUpdate || displayPictureUrl != nil ? nil :
|
||||
ClosedGroup.Columns.displayPictureEncryptionKey.set(to: nil)
|
||||
),
|
||||
(!needsDisplayPictureUpdate || displayPictureUrl != nil ? nil :
|
||||
ClosedGroup.Columns.lastDisplayPictureUpdate.set(to: (serverTimestampMs / 1000))
|
||||
)
|
||||
].compactMap { $0 }
|
||||
|
||||
if !groupChanges.isEmpty {
|
||||
try ClosedGroup
|
||||
.filter(id: groupSessionId.hexString)
|
||||
.updateAllAndConfig(
|
||||
db,
|
||||
groupChanges,
|
||||
calledFromConfig: .groupInfo,
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
|
||||
// If we have a display picture then start downloading it
|
||||
if needsDisplayPictureUpdate, let url: String = displayPictureUrl, let key: Data = displayPictureKey {
|
||||
dependencies[singleton: .jobRunner].add(
|
||||
db,
|
||||
job: Job(
|
||||
variant: .displayPictureDownload,
|
||||
shouldBeUnique: true,
|
||||
details: DisplayPictureDownloadJob.Details(
|
||||
target: .group(id: groupSessionId.hexString, url: url, encryptionKey: key),
|
||||
timestamp: TimeInterval(Double(serverTimestampMs) / 1000)
|
||||
)
|
||||
),
|
||||
canStartJob: true,
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
|
||||
// Update the disappearing messages configuration
|
||||
let targetExpiry: Int32 = groups_info_get_expiry_timer(conf)
|
||||
let localConfig: DisappearingMessagesConfiguration = try DisappearingMessagesConfiguration
|
||||
.fetchOne(db, id: groupSessionId.hexString)
|
||||
.defaulting(to: DisappearingMessagesConfiguration.defaultWith(groupSessionId.hexString))
|
||||
let updatedConfig: DisappearingMessagesConfiguration = DisappearingMessagesConfiguration
|
||||
.defaultWith(groupSessionId.hexString)
|
||||
.with(
|
||||
isEnabled: (targetExpiry > 0),
|
||||
durationSeconds: TimeInterval(targetExpiry),
|
||||
type: .disappearAfterSend
|
||||
)
|
||||
|
||||
if localConfig != updatedConfig {
|
||||
try updatedConfig
|
||||
.saved(db)
|
||||
.clearUnrelatedControlMessages(
|
||||
db,
|
||||
threadVariant: .group,
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
|
||||
// Check if the user is an admin in the group
|
||||
var messageHashesToDelete: Set<String> = []
|
||||
let isAdmin: Bool = ((try? ClosedGroup
|
||||
.filter(id: groupSessionId.hexString)
|
||||
.select(.groupIdentityPrivateKey)
|
||||
.asRequest(of: Data.self)
|
||||
.fetchOne(db)) != nil)
|
||||
|
||||
// If there is a `delete_before` setting then delete all messages before the provided timestamp
|
||||
let deleteBeforeTimestamp: Int64 = groups_info_get_delete_before(conf)
|
||||
|
||||
if deleteBeforeTimestamp > 0 {
|
||||
if isAdmin {
|
||||
let hashesToDelete: Set<String>? = try? Interaction
|
||||
.filter(Interaction.Columns.threadId == groupSessionId.hexString)
|
||||
.filter(Interaction.Columns.timestampMs < (TimeInterval(deleteBeforeTimestamp) * 1000))
|
||||
.filter(Interaction.Columns.serverHash != nil)
|
||||
.select(.serverHash)
|
||||
.asRequest(of: String.self)
|
||||
.fetchSet(db)
|
||||
messageHashesToDelete.insert(contentsOf: hashesToDelete)
|
||||
}
|
||||
|
||||
let deletionCount: Int = try Interaction
|
||||
.filter(Interaction.Columns.threadId == groupSessionId.hexString)
|
||||
.filter(Interaction.Columns.timestampMs < (TimeInterval(deleteBeforeTimestamp) * 1000))
|
||||
.deleteAll(db)
|
||||
|
||||
if deletionCount > 0 {
|
||||
SNLog("[LibSession] Deleted \(deletionCount) message\(plural: deletionCount) from \(groupSessionId.hexString) due to 'delete_before' value.")
|
||||
}
|
||||
}
|
||||
|
||||
// If there is a `attach_delete_before` setting then delete all messages that have attachments before
|
||||
// the provided timestamp and schedule a garbage collection job
|
||||
let attachDeleteBeforeTimestamp: Int64 = groups_info_get_attach_delete_before(conf)
|
||||
|
||||
if attachDeleteBeforeTimestamp > 0 {
|
||||
if isAdmin {
|
||||
let hashesToDelete: Set<String>? = try? Interaction
|
||||
.filter(Interaction.Columns.threadId == groupSessionId.hexString)
|
||||
.filter(Interaction.Columns.timestampMs < (TimeInterval(attachDeleteBeforeTimestamp) * 1000))
|
||||
.filter(Interaction.Columns.serverHash != nil)
|
||||
.joining(required: Interaction.interactionAttachments)
|
||||
.select(.serverHash)
|
||||
.asRequest(of: String.self)
|
||||
.fetchSet(db)
|
||||
messageHashesToDelete.insert(contentsOf: hashesToDelete)
|
||||
}
|
||||
|
||||
let deletionCount: Int = try Interaction
|
||||
.filter(Interaction.Columns.threadId == groupSessionId.hexString)
|
||||
.filter(Interaction.Columns.timestampMs < (TimeInterval(attachDeleteBeforeTimestamp) * 1000))
|
||||
.joining(required: Interaction.interactionAttachments)
|
||||
.deleteAll(db)
|
||||
|
||||
if deletionCount > 0 {
|
||||
SNLog("[LibSession] Deleted \(deletionCount) message\(plural: deletionCount) with attachments from \(groupSessionId.hexString) due to 'attach_delete_before' value.")
|
||||
|
||||
// Schedule a grabage collection job to clean up any now-orphaned attachment files
|
||||
dependencies[singleton: .jobRunner].add(
|
||||
db,
|
||||
job: Job(
|
||||
variant: .garbageCollection,
|
||||
details: GarbageCollectionJob.Details(
|
||||
typesToCollect: [.orphanedAttachments, .orphanedAttachmentFiles]
|
||||
)
|
||||
),
|
||||
canStartJob: true,
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// If the current user is a group admin and there are message hashes which should be deleted then
|
||||
// send a fire-and-forget API call to delete the messages from the swarm
|
||||
if isAdmin && !messageHashesToDelete.isEmpty {
|
||||
(try? Authentication.with(
|
||||
db,
|
||||
sessionIdHexString: groupSessionId.hexString,
|
||||
using: dependencies
|
||||
)).map { authMethod in
|
||||
try? SnodeAPI
|
||||
.preparedDeleteMessages(
|
||||
serverHashes: Array(messageHashesToDelete),
|
||||
requireSuccessfulDeletion: false,
|
||||
authMethod: authMethod,
|
||||
using: dependencies
|
||||
)
|
||||
.send(using: dependencies)
|
||||
.subscribe(on: DispatchQueue.global(qos: .background), using: dependencies)
|
||||
.sinkUntilComplete()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Outgoing Changes
|
||||
|
||||
internal extension LibSession {
|
||||
static func updatingGroupInfo<T>(
|
||||
_ db: Database,
|
||||
_ updated: [T],
|
||||
using dependencies: Dependencies
|
||||
) throws -> [T] {
|
||||
guard let updatedGroups: [ClosedGroup] = updated as? [ClosedGroup] else { throw StorageError.generic }
|
||||
|
||||
// Exclude legacy groups as they aren't managed via LibSession
|
||||
let targetGroups: [ClosedGroup] = updatedGroups
|
||||
.filter { (try? SessionId(from: $0.id))?.prefix == .group }
|
||||
|
||||
// If we only updated the current user contact then no need to continue
|
||||
guard !targetGroups.isEmpty else { return updated }
|
||||
|
||||
// Loop through each of the groups and update their settings
|
||||
try targetGroups.forEach { group in
|
||||
try LibSession.performAndPushChange(
|
||||
db,
|
||||
for: .groupInfo,
|
||||
sessionId: SessionId(.group, hex: group.threadId),
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
/// Update the name
|
||||
///
|
||||
/// **Note:** We indentionally only update the `GROUP_INFO` and not the `USER_GROUPS` as once the
|
||||
/// group is synced between devices we want to rely on the proper group config to get display info
|
||||
var updatedName: [CChar] = group.name.cArray.nullTerminated()
|
||||
groups_info_set_name(conf, &updatedName)
|
||||
|
||||
var updatedDescription: [CChar] = (group.groupDescription ?? "").cArray.nullTerminated()
|
||||
groups_info_set_description(conf, &updatedDescription)
|
||||
|
||||
// Either assign the updated display pic, or sent a blank pic (to remove the current one)
|
||||
var displayPic: user_profile_pic = user_profile_pic()
|
||||
displayPic.url = group.displayPictureUrl.toLibSession()
|
||||
displayPic.key = group.displayPictureEncryptionKey.toLibSession()
|
||||
groups_info_set_pic(conf, displayPic)
|
||||
}
|
||||
}
|
||||
|
||||
return updated
|
||||
}
|
||||
|
||||
static func updatingDisappearingConfigsGroups<T>(
|
||||
_ db: Database,
|
||||
_ updated: [T],
|
||||
using dependencies: Dependencies
|
||||
) throws -> [T] {
|
||||
guard let updatedDisappearingConfigs: [DisappearingMessagesConfiguration] = updated as? [DisappearingMessagesConfiguration] else { throw StorageError.generic }
|
||||
|
||||
// Filter out any disappearing config changes not related to updated groups
|
||||
let targetUpdatedConfigs: [DisappearingMessagesConfiguration] = updatedDisappearingConfigs
|
||||
.filter { (try? SessionId.Prefix(from: $0.id)) == .group }
|
||||
|
||||
guard !targetUpdatedConfigs.isEmpty else { return updated }
|
||||
|
||||
// We should only sync disappearing messages configs which are associated to existing groups
|
||||
let existingGroupIds: [String] = (try? ClosedGroup
|
||||
.filter(ids: targetUpdatedConfigs.map { $0.id })
|
||||
.select(.threadId)
|
||||
.asRequest(of: String.self)
|
||||
.fetchAll(db))
|
||||
.defaulting(to: [])
|
||||
|
||||
// If none of the disappearing messages configs are associated with existing groups then ignore
|
||||
// the changes (no need to do a config sync)
|
||||
guard !existingGroupIds.isEmpty else { return updated }
|
||||
|
||||
// Loop through each of the groups and update their settings
|
||||
try existingGroupIds
|
||||
.compactMap { groupId in targetUpdatedConfigs.first(where: { $0.id == groupId }).map { (groupId, $0) } }
|
||||
.forEach { groupId, updatedConfig in
|
||||
try LibSession.performAndPushChange(
|
||||
db,
|
||||
for: .groupInfo,
|
||||
sessionId: SessionId(.group, hex: groupId),
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
groups_info_set_expiry_timer(conf, Int32(updatedConfig.durationSeconds))
|
||||
}
|
||||
}
|
||||
|
||||
return updated
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - External Outgoing Changes
|
||||
|
||||
public extension LibSession {
|
||||
static func update(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
disappearingConfig: DisappearingMessagesConfiguration?,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try LibSession.performAndPushChange(
|
||||
db,
|
||||
for: .groupInfo,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
if let config: DisappearingMessagesConfiguration = disappearingConfig {
|
||||
groups_info_set_expiry_timer(conf, Int32(config.durationSeconds))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static func deleteMessagesBefore(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
timestamp: TimeInterval,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try LibSession.performAndPushChange(
|
||||
db,
|
||||
for: .groupInfo,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
// Do nothing if the timestamp isn't newer than the current value
|
||||
guard Int64(timestamp) > groups_info_get_delete_before(conf) else { return }
|
||||
|
||||
groups_info_set_delete_before(conf, Int64(timestamp))
|
||||
}
|
||||
}
|
||||
|
||||
static func deleteAttachmentsBefore(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
timestamp: TimeInterval,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try LibSession.performAndPushChange(
|
||||
db,
|
||||
for: .groupInfo,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
// Do nothing if the timestamp isn't newer than the current value
|
||||
guard Int64(timestamp) > groups_info_get_attach_delete_before(conf) else { return }
|
||||
|
||||
groups_info_set_attach_delete_before(conf, Int64(timestamp))
|
||||
}
|
||||
}
|
||||
|
||||
static func deleteGroupForEveryone(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try LibSession.performAndPushChange(
|
||||
db,
|
||||
for: .groupInfo,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
groups_info_destroy_group(conf)
|
||||
}
|
||||
}
|
||||
|
||||
static func groupIsDestroyed(
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) -> Bool {
|
||||
return dependencies[cache: .LibSession]
|
||||
.config(for: .groupInfo, sessionId: groupSessionId)
|
||||
.wrappedValue
|
||||
.map { config in
|
||||
guard case .object(let conf) = config else { return false }
|
||||
|
||||
return groups_info_is_destroyed(conf)
|
||||
}
|
||||
.defaulting(to: false)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,209 @@
|
||||
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import Foundation
|
||||
import GRDB
|
||||
import SessionUtil
|
||||
import SessionUtilitiesKit
|
||||
|
||||
// MARK: - Size Restrictions
|
||||
|
||||
public extension LibSession {
|
||||
static var sizeAuthDataBytes: Int { 100 }
|
||||
static var sizeSubaccountBytes: Int { 36 }
|
||||
static var sizeSubaccountSigBytes: Int { 64 }
|
||||
static var sizeSubaccountSignatureBytes: Int { 64 }
|
||||
}
|
||||
|
||||
// MARK: - Group Keys Handling
|
||||
|
||||
internal extension LibSession {
|
||||
/// `libSession` manages keys entirely so there is no need for a DB presence
|
||||
static let columnsRelatedToGroupKeys: [ColumnExpression] = []
|
||||
|
||||
// MARK: - Incoming Changes
|
||||
|
||||
static func handleGroupKeysUpdate(
|
||||
_ db: Database,
|
||||
in config: Config?,
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
guard case .groupKeys(let conf, let infoConf, let membersConf) = config else {
|
||||
throw LibSessionError.invalidConfigObject
|
||||
}
|
||||
|
||||
/// If two admins rekeyed for different member changes at the same time then there is a "key collision" and the "needs rekey" function
|
||||
/// will return true to indicate that a 3rd `rekey` needs to be made to have a final set of keys which includes all members
|
||||
///
|
||||
/// **Note:** We don't check `needsDump` in this case because the local state _could_ be persisted yet still require a `rekey`
|
||||
/// so we should rely solely on `groups_keys_needs_rekey`
|
||||
guard groups_keys_needs_rekey(conf) else { return }
|
||||
|
||||
// Performing a `rekey` returns the updated key data which we don't use directly, this updated
|
||||
// key will now be returned by `groups_keys_pending_config` which the `ConfigurationSyncJob` uses
|
||||
// when generating pending changes for group keys so we don't need to push it directly
|
||||
var pushResult: UnsafePointer<UInt8>? = nil
|
||||
var pushResultLen: Int = 0
|
||||
guard groups_keys_rekey(conf, infoConf, membersConf, &pushResult, &pushResultLen) else {
|
||||
throw LibSessionError.failedToRekeyGroup
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Outgoing Changes
|
||||
|
||||
internal extension LibSession {
|
||||
static func rekey(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try SessionUtil.performAndPushChange(
|
||||
db,
|
||||
for: .groupKeys,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .groupKeys(let conf, let infoConf, let membersConf) = config else {
|
||||
throw LibSessionError.invalidConfigObject
|
||||
}
|
||||
|
||||
// Performing a `rekey` returns the updated key data which we don't use directly, this updated
|
||||
// key will now be returned by `groups_keys_pending_config` which the `ConfigurationSyncJob` uses
|
||||
// when generating pending changes for group keys so we don't need to push it directly
|
||||
var pushResult: UnsafePointer<UInt8>? = nil
|
||||
var pushResultLen: Int = 0
|
||||
guard groups_keys_rekey(conf, infoConf, membersConf, &pushResult, &pushResultLen) else {
|
||||
throw LibSessionError.failedToRekeyGroup
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static func keySupplement(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
memberIds: Set<String>,
|
||||
using dependencies: Dependencies
|
||||
) throws -> Data {
|
||||
try dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupKeys, sessionId: groupSessionId)
|
||||
.wrappedValue
|
||||
.map { config -> Data in
|
||||
guard case .groupKeys(let conf, _, _) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
var cMemberIds: [UnsafePointer<CChar>?] = memberIds
|
||||
.map { id in id.cArray.nullTerminated() }
|
||||
.unsafeCopy()
|
||||
|
||||
defer { cMemberIds.forEach { $0?.deallocate() } }
|
||||
|
||||
// Performing a `key_supplement` returns the supplemental key changes, since our state doesn't care
|
||||
// about the `GROUP_KEYS` needed for other members this change won't result in the `GROUP_KEYS` config
|
||||
// going into a pending state or the `ConfigurationSyncJob` getting triggered so return the data so that
|
||||
// the caller can push it directly
|
||||
var cSupplementData: UnsafeMutablePointer<UInt8>!
|
||||
var cSupplementDataLen: Int = 0
|
||||
|
||||
guard
|
||||
groups_keys_key_supplement(conf, &cMemberIds, cMemberIds.count, &cSupplementData, &cSupplementDataLen),
|
||||
let cSupplementData: UnsafeMutablePointer<UInt8> = cSupplementData
|
||||
else { throw LibSessionError.failedToKeySupplementGroup }
|
||||
|
||||
// Must deallocate on success
|
||||
let supplementData: Data = Data(
|
||||
bytes: cSupplementData,
|
||||
count: cSupplementDataLen
|
||||
)
|
||||
cSupplementData.deallocate()
|
||||
|
||||
return supplementData
|
||||
} ?? { throw LibSessionError.invalidConfigObject }()
|
||||
}
|
||||
|
||||
static func loadAdminKey(
|
||||
_ db: Database,
|
||||
groupIdentitySeed: Data,
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try SessionUtil
|
||||
.performAndPushChange(
|
||||
db,
|
||||
for: .groupKeys,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .groupKeys(let conf, let infoConf, let membersConf) = config else {
|
||||
throw LibSessionError.invalidConfigObject
|
||||
}
|
||||
|
||||
var identitySeed: [UInt8] = Array(groupIdentitySeed)
|
||||
try CExceptionHelper.performSafely {
|
||||
groups_keys_load_admin_key(conf, &identitySeed, infoConf, membersConf)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static func currentGeneration(
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws -> Int {
|
||||
try dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupKeys, sessionId: groupSessionId)
|
||||
.wrappedValue
|
||||
.map { config -> Int in
|
||||
guard case .groupKeys(let conf, _, _) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
return Int(groups_keys_current_generation(conf))
|
||||
} ?? { throw LibSessionError.invalidConfigObject }()
|
||||
}
|
||||
|
||||
static func generateSubaccountToken(
|
||||
groupSessionId: SessionId,
|
||||
memberId: String,
|
||||
using dependencies: Dependencies
|
||||
) throws -> [UInt8] {
|
||||
try dependencies[singleton: .crypto].tryGenerate(
|
||||
.tokenSubaccount(
|
||||
config: dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupKeys, sessionId: groupSessionId)
|
||||
.wrappedValue,
|
||||
groupSessionId: groupSessionId,
|
||||
memberId: memberId
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
static func generateAuthData(
|
||||
groupSessionId: SessionId,
|
||||
memberId: String,
|
||||
using dependencies: Dependencies
|
||||
) throws -> Authentication.Info {
|
||||
try dependencies[singleton: .crypto].tryGenerate(
|
||||
.memberAuthData(
|
||||
config: dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupKeys, sessionId: groupSessionId)
|
||||
.wrappedValue,
|
||||
groupSessionId: groupSessionId,
|
||||
memberId: memberId
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
static func generateSubaccountSignature(
|
||||
groupSessionId: SessionId,
|
||||
verificationBytes: [UInt8],
|
||||
memberAuthData: Data,
|
||||
using dependencies: Dependencies
|
||||
) throws -> Authentication.Signature {
|
||||
try dependencies[singleton: .crypto].tryGenerate(
|
||||
.signatureSubaccount(
|
||||
config: dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupKeys, sessionId: groupSessionId)
|
||||
.wrappedValue,
|
||||
verificationBytes: verificationBytes,
|
||||
memberAuthData: memberAuthData
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,494 @@
|
||||
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import Foundation
|
||||
import GRDB
|
||||
import SessionUtil
|
||||
import SessionSnodeKit
|
||||
import SessionUtilitiesKit
|
||||
|
||||
// MARK: - Size Restrictions
|
||||
|
||||
public extension LibSession {
|
||||
static var sizeMaxGroupMemberCount: Int { 100 }
|
||||
}
|
||||
|
||||
// MARK: - Group Members Handling
|
||||
|
||||
internal extension LibSession {
|
||||
static let columnsRelatedToGroupMembers: [ColumnExpression] = [
|
||||
GroupMember.Columns.role,
|
||||
GroupMember.Columns.roleStatus
|
||||
]
|
||||
|
||||
// MARK: - Incoming Changes
|
||||
|
||||
static func handleGroupMembersUpdate(
|
||||
_ db: Database,
|
||||
in config: Config?,
|
||||
groupSessionId: SessionId,
|
||||
serverTimestampMs: Int64,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
guard config.needsDump(using: dependencies) else { return }
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
// Get the two member sets
|
||||
let updatedMembers: Set<GroupMember> = try extractMembers(from: conf, groupSessionId: groupSessionId)
|
||||
let existingMembers: Set<GroupMember> = (try? GroupMember
|
||||
.filter(GroupMember.Columns.groupId == groupSessionId.hexString)
|
||||
.fetchSet(db))
|
||||
.defaulting(to: [])
|
||||
let updatedStandardMemberIds: Set<String> = updatedMembers
|
||||
.filter { $0.role == .standard }
|
||||
.map { $0.profileId }
|
||||
.asSet()
|
||||
let updatedAdminMemberIds: Set<String> = updatedMembers
|
||||
.filter { $0.role == .admin }
|
||||
.map { $0.profileId }
|
||||
.asSet()
|
||||
|
||||
// Add in any new members and remove any removed members
|
||||
try updatedMembers
|
||||
.subtracting(existingMembers)
|
||||
.forEach { try $0.upsert(db) }
|
||||
|
||||
try GroupMember
|
||||
.filter(GroupMember.Columns.groupId == groupSessionId.hexString)
|
||||
.filter(
|
||||
(
|
||||
GroupMember.Columns.role == GroupMember.Role.standard &&
|
||||
!updatedStandardMemberIds.contains(GroupMember.Columns.profileId)
|
||||
) || (
|
||||
GroupMember.Columns.role == GroupMember.Role.admin &&
|
||||
!updatedAdminMemberIds.contains(GroupMember.Columns.profileId)
|
||||
)
|
||||
)
|
||||
.deleteAll(db)
|
||||
|
||||
// Schedule a job to process the removals
|
||||
if (try? extractPendingRemovals(from: conf, groupSessionId: groupSessionId))?.isEmpty == false {
|
||||
dependencies[singleton: .jobRunner].add(
|
||||
db,
|
||||
job: Job(
|
||||
variant: .processPendingGroupMemberRemovals,
|
||||
threadId: groupSessionId.hexString,
|
||||
details: ProcessPendingGroupMemberRemovalsJob.Details(
|
||||
changeTimestampMs: serverTimestampMs
|
||||
)
|
||||
),
|
||||
canStartJob: true,
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
|
||||
// If there were members then also extract and update the profile information for the members
|
||||
// if we don't have newer data locally
|
||||
guard !updatedMembers.isEmpty else { return }
|
||||
|
||||
let groupProfiles: Set<Profile>? = try? extractProfiles(
|
||||
from: conf,
|
||||
groupSessionId: groupSessionId,
|
||||
serverTimestampMs: serverTimestampMs
|
||||
)
|
||||
|
||||
groupProfiles?.forEach { profile in
|
||||
try? Profile.updateIfNeeded(
|
||||
db,
|
||||
publicKey: profile.id,
|
||||
name: profile.name,
|
||||
displayPictureUpdate: {
|
||||
guard
|
||||
let profilePictureUrl: String = profile.profilePictureUrl,
|
||||
let profileKey: Data = profile.profileEncryptionKey
|
||||
else { return .none }
|
||||
|
||||
return .updateTo(
|
||||
url: profilePictureUrl,
|
||||
key: profileKey,
|
||||
fileName: nil
|
||||
)
|
||||
}(),
|
||||
sentTimestamp: TimeInterval(Double(serverTimestampMs) * 1000),
|
||||
calledFromConfig: .groupMembers,
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Outgoing Changes
|
||||
|
||||
internal extension LibSession {
|
||||
static func getMembers(
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws -> Set<GroupMember> {
|
||||
return try dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupMembers, sessionId: groupSessionId)
|
||||
.wrappedValue
|
||||
.map { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
return try extractMembers(
|
||||
from: conf,
|
||||
groupSessionId: groupSessionId
|
||||
)
|
||||
} ?? { throw LibSessionError.failedToRetrieveConfigData }()
|
||||
}
|
||||
|
||||
static func getPendingMemberRemovals(
|
||||
groupSessionId: SessionId,
|
||||
using dependencies: Dependencies
|
||||
) throws -> [String: Bool] {
|
||||
return try dependencies[cache: .sessionUtil]
|
||||
.config(for: .groupMembers, sessionId: groupSessionId)
|
||||
.wrappedValue
|
||||
.map { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
return try extractPendingRemovals(
|
||||
from: conf,
|
||||
groupSessionId: groupSessionId
|
||||
)
|
||||
} ?? { throw LibSessionError.failedToRetrieveConfigData }()
|
||||
}
|
||||
|
||||
static func addMembers(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
members: [(id: String, profile: Profile?)],
|
||||
allowAccessToHistoricMessages: Bool,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try SessionUtil.performAndPushChange(
|
||||
db,
|
||||
for: .groupMembers,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
try members.forEach { memberId, profile in
|
||||
var profilePic: user_profile_pic = user_profile_pic()
|
||||
|
||||
if
|
||||
let picUrl: String = profile?.profilePictureUrl,
|
||||
let picKey: Data = profile?.profileEncryptionKey,
|
||||
!picUrl.isEmpty,
|
||||
picKey.count == DisplayPictureManager.aes256KeyByteLength
|
||||
{
|
||||
profilePic.url = picUrl.toLibSession()
|
||||
profilePic.key = picKey.toLibSession()
|
||||
}
|
||||
|
||||
var error: LibSessionError?
|
||||
try CExceptionHelper.performSafely {
|
||||
var cMemberId: [CChar] = memberId.cArray
|
||||
var member: config_group_member = config_group_member()
|
||||
|
||||
guard groups_members_get_or_construct(conf, &member, &cMemberId) else {
|
||||
error = .getOrConstructFailedUnexpectedly
|
||||
return
|
||||
}
|
||||
|
||||
// Don't override the existing name with an empty one
|
||||
if let memberName: String = profile?.name, !memberName.isEmpty {
|
||||
member.name = memberName.toLibSession()
|
||||
}
|
||||
member.profile_pic = profilePic
|
||||
member.invited = 1
|
||||
member.supplement = allowAccessToHistoricMessages
|
||||
groups_members_set(conf, &member)
|
||||
}
|
||||
|
||||
if let error: LibSessionError = error {
|
||||
SNLog("[LibSession] Failed to add member to group: \(groupSessionId)")
|
||||
throw error
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static func updateMemberStatus(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
memberId: String,
|
||||
role: GroupMember.Role,
|
||||
status: GroupMember.RoleStatus,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try SessionUtil.performAndPushChange(
|
||||
db,
|
||||
for: .groupMembers,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
// Only update members if they already exist in the group
|
||||
var cMemberId: [CChar] = memberId.cArray
|
||||
var groupMember: config_group_member = config_group_member()
|
||||
|
||||
// If the member doesn't exist or the role status is already "accepted" then do nothing
|
||||
guard
|
||||
groups_members_get(conf, &groupMember, &cMemberId) && (
|
||||
(role == .standard && groupMember.invited != Int32(GroupMember.RoleStatus.accepted.rawValue)) ||
|
||||
(role == .admin && (
|
||||
!groupMember.admin ||
|
||||
groupMember.promoted != Int32(GroupMember.RoleStatus.accepted.rawValue)
|
||||
))
|
||||
)
|
||||
else { return }
|
||||
|
||||
switch role {
|
||||
case .standard: groupMember.invited = Int32(status.rawValue)
|
||||
case .admin:
|
||||
groupMember.admin = (status == .accepted)
|
||||
groupMember.promoted = Int32(status.rawValue)
|
||||
|
||||
default: break
|
||||
}
|
||||
|
||||
groups_members_set(conf, &groupMember)
|
||||
}
|
||||
}
|
||||
|
||||
static func flagMembersForRemoval(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
memberIds: Set<String>,
|
||||
removeMessages: Bool,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try SessionUtil.performAndPushChange(
|
||||
db,
|
||||
for: .groupMembers,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
memberIds.forEach { memberId in
|
||||
// Only update members if they already exist in the group
|
||||
var cMemberId: [CChar] = memberId.cArray
|
||||
var groupMember: config_group_member = config_group_member()
|
||||
|
||||
guard groups_members_get(conf, &groupMember, &cMemberId) else { return }
|
||||
|
||||
groupMember.removed = (removeMessages ? 2 : 1)
|
||||
groups_members_set(conf, &groupMember)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static func removeMembers(
|
||||
_ db: Database,
|
||||
groupSessionId: SessionId,
|
||||
memberIds: Set<String>,
|
||||
using dependencies: Dependencies
|
||||
) throws {
|
||||
try SessionUtil.performAndPushChange(
|
||||
db,
|
||||
for: .groupMembers,
|
||||
sessionId: groupSessionId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
memberIds.forEach { memberId in
|
||||
var cMemberId: [CChar] = memberId.cArray
|
||||
groups_members_erase(conf, &cMemberId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static func updatingGroupMembers<T>(
|
||||
_ db: Database,
|
||||
_ updated: [T],
|
||||
using dependencies: Dependencies
|
||||
) throws -> [T] {
|
||||
guard let updatedMembers: [GroupMember] = updated as? [GroupMember] else { throw StorageError.generic }
|
||||
|
||||
// Exclude legacy groups as they aren't managed via SessionUtil
|
||||
let targetMembers: [GroupMember] = updatedMembers
|
||||
.filter { (try? SessionId(from: $0.groupId))?.prefix == .group }
|
||||
|
||||
// If we only updated the current user contact then no need to continue
|
||||
guard
|
||||
!targetMembers.isEmpty,
|
||||
let groupId: SessionId = targetMembers.first.map({ try? SessionId(from: $0.groupId) }),
|
||||
groupId.prefix == .group
|
||||
else { return updated }
|
||||
|
||||
// Loop through each of the groups and update their settings
|
||||
try targetMembers.forEach { member in
|
||||
try SessionUtil.performAndPushChange(
|
||||
db,
|
||||
for: .groupMembers,
|
||||
sessionId: groupId,
|
||||
using: dependencies
|
||||
) { config in
|
||||
guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
|
||||
|
||||
// Only update members if they already exist in the group
|
||||
var cMemberId: [CChar] = member.profileId.cArray
|
||||
var groupMember: config_group_member = config_group_member()
|
||||
|
||||
guard groups_members_get(conf, &groupMember, &cMemberId) else {
|
||||
return
|
||||
}
|
||||
|
||||
// Update the role and status to match
|
||||
switch member.role {
|
||||
case .admin:
|
||||
groupMember.admin = true
|
||||
groupMember.invited = 0
|
||||
groupMember.promoted = member.roleStatus.libSessionValue
|
||||
|
||||
default:
|
||||
groupMember.admin = false
|
||||
groupMember.invited = member.roleStatus.libSessionValue
|
||||
groupMember.promoted = 0
|
||||
}
|
||||
|
||||
groups_members_set(conf, &groupMember)
|
||||
}
|
||||
}
|
||||
|
||||
return updated
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - MemberData
|
||||
|
||||
private struct MemberData {
|
||||
let memberId: String
|
||||
let profile: Profile?
|
||||
let admin: Bool
|
||||
let invited: Int32
|
||||
let promoted: Int32
|
||||
}
|
||||
|
||||
// MARK: - Convenience
|
||||
|
||||
internal extension LibSession {
|
||||
static func extractMembers(
|
||||
from conf: UnsafeMutablePointer<config_object>?,
|
||||
groupSessionId: SessionId
|
||||
) throws -> Set<GroupMember> {
|
||||
var infiniteLoopGuard: Int = 0
|
||||
var result: [GroupMember] = []
|
||||
var member: config_group_member = config_group_member()
|
||||
let membersIterator: UnsafeMutablePointer<groups_members_iterator> = groups_members_iterator_new(conf)
|
||||
|
||||
while !groups_members_iterator_done(membersIterator, &member) {
|
||||
try SessionUtil.checkLoopLimitReached(&infiniteLoopGuard, for: .groupMembers)
|
||||
|
||||
// Ignore members pending removal
|
||||
guard member.removed == 0 else { continue }
|
||||
|
||||
let memberId: String = String(cString: withUnsafeBytes(of: member.session_id) { [UInt8]($0) }
|
||||
.map { CChar($0) }
|
||||
.nullTerminated()
|
||||
)
|
||||
|
||||
result.append(
|
||||
GroupMember(
|
||||
groupId: groupSessionId.hexString,
|
||||
profileId: memberId,
|
||||
role: (member.admin || (member.promoted > 0) ? .admin : .standard),
|
||||
roleStatus: {
|
||||
switch (member.invited, member.promoted, member.admin) {
|
||||
case (2, _, _), (_, 2, false): return .failed // Explicitly failed
|
||||
case (1..., _, _), (_, 1..., false): return .pending // Pending if not accepted
|
||||
default: return .accepted // Otherwise it's accepted
|
||||
}
|
||||
}(),
|
||||
isHidden: false
|
||||
)
|
||||
)
|
||||
|
||||
groups_members_iterator_advance(membersIterator)
|
||||
}
|
||||
groups_members_iterator_free(membersIterator) // Need to free the iterator
|
||||
|
||||
return result.asSet()
|
||||
}
|
||||
|
||||
static func extractPendingRemovals(
|
||||
from conf: UnsafeMutablePointer<config_object>?,
|
||||
groupSessionId: SessionId
|
||||
) throws -> [String: Bool] {
|
||||
var infiniteLoopGuard: Int = 0
|
||||
var result: [String: Bool] = [:]
|
||||
var member: config_group_member = config_group_member()
|
||||
let membersIterator: UnsafeMutablePointer<groups_members_iterator> = groups_members_iterator_new(conf)
|
||||
|
||||
while !groups_members_iterator_done(membersIterator, &member) {
|
||||
try SessionUtil.checkLoopLimitReached(&infiniteLoopGuard, for: .groupMembers)
|
||||
|
||||
guard member.removed > 0 else {
|
||||
groups_members_iterator_advance(membersIterator)
|
||||
continue
|
||||
}
|
||||
|
||||
let memberId: String = String(cString: withUnsafeBytes(of: member.session_id) { [UInt8]($0) }
|
||||
.map { CChar($0) }
|
||||
.nullTerminated()
|
||||
)
|
||||
|
||||
result[memberId] = (member.removed == 2)
|
||||
groups_members_iterator_advance(membersIterator)
|
||||
}
|
||||
groups_members_iterator_free(membersIterator) // Need to free the iterator
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
static func extractProfiles(
|
||||
from conf: UnsafeMutablePointer<config_object>?,
|
||||
groupSessionId: SessionId,
|
||||
serverTimestampMs: Int64
|
||||
) throws -> Set<Profile> {
|
||||
var infiniteLoopGuard: Int = 0
|
||||
var result: [Profile] = []
|
||||
var member: config_group_member = config_group_member()
|
||||
let membersIterator: UnsafeMutablePointer<groups_members_iterator> = groups_members_iterator_new(conf)
|
||||
|
||||
while !groups_members_iterator_done(membersIterator, &member) {
|
||||
try SessionUtil.checkLoopLimitReached(&infiniteLoopGuard, for: .groupMembers)
|
||||
|
||||
// Ignore members pending removal
|
||||
guard member.removed == 0 else { continue }
|
||||
|
||||
let memberId: String = String(cString: withUnsafeBytes(of: member.session_id) { [UInt8]($0) }
|
||||
.map { CChar($0) }
|
||||
.nullTerminated()
|
||||
)
|
||||
let profilePictureUrl: String? = String(libSessionVal: member.profile_pic.url, nullIfEmpty: true)
|
||||
|
||||
result.append(
|
||||
Profile(
|
||||
id: memberId,
|
||||
name: String(libSessionVal: member.name),
|
||||
lastNameUpdate: TimeInterval(Double(serverTimestampMs) / 1000),
|
||||
nickname: nil,
|
||||
profilePictureUrl: profilePictureUrl,
|
||||
profileEncryptionKey: (profilePictureUrl == nil ? nil :
|
||||
Data(
|
||||
libSessionVal: member.profile_pic.key,
|
||||
count: DisplayPictureManager.aes256KeyByteLength
|
||||
)
|
||||
),
|
||||
lastProfilePictureUpdate: TimeInterval(Double(serverTimestampMs) / 1000),
|
||||
lastBlocksCommunityMessageRequests: nil
|
||||
)
|
||||
)
|
||||
|
||||
groups_members_iterator_advance(membersIterator)
|
||||
}
|
||||
groups_members_iterator_free(membersIterator) // Need to free the iterator
|
||||
|
||||
return result.asSet()
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue