@ -7,11 +7,21 @@ import GRDB
import SessionUtilitiesKit
public struct ProfileManager {
public enum Avatar Update {
public enum DisplayName Update {
case none
case remove
case uploadImageData ( Data )
case updateTo ( url : String , key : Data , fileName : String ? )
case contactUpdate ( String ? )
case currentUserUpdate ( String ? )
}
public enum DisplayPictureUpdate {
case none
case contactRemove
case contactUpdateTo ( url : String , key : Data , fileName : String ? )
case currentUserRemove
case currentUserUploadImageData ( Data )
case currentUserUpdateTo ( url : String , key : Data , fileName : String ? )
}
// T h e m a x b y t e s f o r a u s e r ' s p r o f i l e n a m e , e n c o d e d i n U T F 8 .
@ -281,24 +291,27 @@ public struct ProfileManager {
public static func updateLocal (
queue : DispatchQueue ,
profileName: String ,
avatarUpdate: Avatar Update = . none ,
displayNameUpdate: DisplayNameUpdate = . none ,
displayPictureUpdate: DisplayPicture Update = . none ,
success : ( ( Database ) throws -> ( ) ) ? = nil ,
failure : ( ( ProfileManagerError ) -> ( ) ) ? = nil ,
using dependencies : Dependencies = Dependencies ( )
) {
let userPublicKey : String = getUserHexEncodedPublicKey ( using : dependencies )
let isRemoving Avatar : Bool = {
switch avatar Update {
case . : return true
let isRemoving DisplayPicture : Bool = {
switch displayPicture Update {
case . cu rrentUserR emove: return true
default : return false
}
} ( )
switch avatarUpdate {
case . none , . remove , . updateTo :
switch displayPictureUpdate {
case . contactRemove , . contactUpdateTo :
failure ? ( ProfileManagerError . invalidCall )
case . none , . currentUserRemove , . currentUserUpdateTo :
dependencies . storage . writeAsync { db in
if isRemovingAvatar {
if isRemoving DisplayPicture {
let existingProfileUrl : String ? = try Profile
. filter ( id : userPublicKey )
. select ( . profilePictureUrl )
@ -324,8 +337,8 @@ public struct ProfileManager {
try ProfileManager . updateProfileIfNeeded (
db ,
publicKey : userPublicKey ,
name: profileNam e,
avatarUpdate: avatar Update,
displayNameUpdate: displayNameUpdat e,
displayPictureUpdate: displayPicture Update,
sentTimestamp : dependencies . dateNow . timeIntervalSince1970 ,
using : dependencies
)
@ -334,7 +347,7 @@ public struct ProfileManager {
try success ? ( db )
}
case . ( let data ) :
case . c urrentUserU ploadImageData( let data ) :
prepareAndUploadAvatarImage (
queue : queue ,
imageData : data ,
@ -343,8 +356,8 @@ public struct ProfileManager {
try ProfileManager . updateProfileIfNeeded (
db ,
publicKey : userPublicKey ,
name: profileNam e,
avatarUpdate: . u pdateTo( url : downloadUrl , key : newProfileKey , fileName : fileName ) ,
displayNameUpdate: displayNameUpdat e,
displayPictureUpdate: . currentUserU pdateTo( url : downloadUrl , key : newProfileKey , fileName : fileName ) ,
sentTimestamp : dependencies . dateNow . timeIntervalSince1970 ,
using : dependencies
)
@ -494,9 +507,9 @@ public struct ProfileManager {
public static func updateProfileIfNeeded (
_ db : Database ,
publicKey : String ,
name : String ? ,
displayNameUpdate : DisplayNameUpdate = . none ,
displayPictureUpdate : DisplayPictureUpdate ,
blocksCommunityMessageRequests : Bool ? = nil ,
avatarUpdate : AvatarUpdate ,
sentTimestamp : TimeInterval ,
calledFromConfigHandling : Bool = false ,
using dependencies : Dependencies
@ -506,15 +519,21 @@ public struct ProfileManager {
var profileChanges : [ ConfigColumnAssignment ] = [ ]
// N a m e
if let name : String = name , ! name . isEmpty , name != profile . name {
if sentTimestamp > ( profile . lastNameUpdate ? ? 0 ) || ( isCurrentUser && calledFromConfigHandling ) {
// FIXME: T h i s ' l a s t N a m e U p d a t e ' a p p r o a c h i s b u g g y - w e s h o u l d h a v e a t i m e s t a m p o n t h e C o n v o I n f o V o l a t i l e
switch ( displayNameUpdate , isCurrentUser , ( sentTimestamp > ( profile . lastNameUpdate ? ? 0 ) ) ) {
case ( . none , _ , _ ) : break
case ( . currentUserUpdate ( let name ) , true , _ ) , ( . contactUpdate ( let name ) , false , true ) :
guard let name : String = name , ! name . isEmpty , name != profile . name else { break }
profileChanges . append ( Profile . Columns . name . set ( to : name ) )
profileChanges . append ( Profile . Columns . lastNameUpdate . set ( to : sentTimestamp ) )
}
// D o n ' t w a n t p r o f i l e s i n m e s s a g e s t o m o d i f y t h e c u r r e n t u s e r s p r o f i l e i n f o s o i g n o r e t h o s e c a s e s
default : break
}
// B l o c k s c o m m u n i t y m e s s a g e r e q u e t s f l a g
if let blocksCommunityMessageRequests : Bool = blocksCommunityMessageRequests , sentTimestamp > ( profile . lastBlocksCommunityMessageRequests ? ? 0 ) {
// B l o c k s c o m m u n i t y m e s s a g e r e q u e t s f l a g ( o n l y u p d a t e f o r o t h e r u s e r s )
if ! isCurrentUser , let blocksCommunityMessageRequests : Bool = blocksCommunityMessageRequests , sentTimestamp > ( profile . lastBlocksCommunityMessageRequests ? ? 0 ) {
profileChanges . append ( Profile . Columns . blocksCommunityMessageRequests . set ( to : blocksCommunityMessageRequests ) )
profileChanges . append ( Profile . Columns . lastBlocksCommunityMessageRequests . set ( to : sentTimestamp ) )
}
@ -522,43 +541,49 @@ public struct ProfileManager {
// P r o f i l e p i c t u r e & p r o f i l e k e y
var avatarNeedsDownload : Bool = false
var targetAvatarUrl : String ? = nil
let shouldUpdateAvatar : Bool = (
( ! isCurrentUser && ( sentTimestamp > ( profile . lastProfilePictureUpdate ? ? 0 ) ) ) || // U p d a t e o t h e r u s e r s
( isCurrentUser && calledFromConfigHandling ) // O n l y u p d a t e t h e c u r r e n t u s e r v i a c o n f i g m e s s a g e s
)
if sentTimestamp > ( profile . lastProfilePictureUpdate ? ? 0 ) || ( isCurrentUser && calledFromConfigHandling ) {
switch avatarUpdate {
case . none : break
case . uploadImageData : preconditionFailure ( " Invalid options for this function " )
case . remove :
profileChanges . append ( Profile . Columns . profilePictureUrl . set ( to : nil ) )
profileChanges . append ( Profile . Columns . profileEncryptionKey . set ( to : nil ) )
profileChanges . append ( Profile . Columns . profilePictureFileName . set ( to : nil ) )
profileChanges . append ( Profile . Columns . lastProfilePictureUpdate . set ( to : sentTimestamp ) )
case . updateTo ( let url , let key , let fileName ) :
if url != profile . profilePictureUrl {
profileChanges . append ( Profile . Columns . profilePictureUrl . set ( to : url ) )
avatarNeedsDownload = true
targetAvatarUrl = url
}
if key != profile . profileEncryptionKey && key . count = = ProfileManager . avatarAES256KeyByteLength {
profileChanges . append ( Profile . Columns . profileEncryptionKey . set ( to : key ) )
}
// P r o f i l e f i l e n a m e ( t h i s i s n ' t s y n c h r o n i z e d b e t w e e n d e v i c e s )
if let fileName : String = fileName {
profileChanges . append ( Profile . Columns . profilePictureFileName . set ( to : fileName ) )
// I f w e h a v e a l r e a d y d o w n l o a d e d t h e i m a g e t h e n n o n e e d t o d o w n l o a d i t a g a i n
avatarNeedsDownload = (
avatarNeedsDownload &&
! ProfileManager . hasProfileImageData ( with : fileName )
)
}
switch ( displayPictureUpdate , isCurrentUser ) {
case ( . none , _ ) : break
case ( . currentUserUploadImageData , _ ) : preconditionFailure ( " Invalid options for this function " )
case ( . contactRemove , false ) , ( . currentUserRemove , true ) :
profileChanges . append ( Profile . Columns . profilePictureUrl . set ( to : nil ) )
profileChanges . append ( Profile . Columns . profileEncryptionKey . set ( to : nil ) )
profileChanges . append ( Profile . Columns . profilePictureFileName . set ( to : nil ) )
profileChanges . append ( Profile . Columns . lastProfilePictureUpdate . set ( to : sentTimestamp ) )
case ( . contactUpdateTo ( let url , let key , let fileName ) , false ) ,
( . currentUserUpdateTo ( let url , let key , let fileName ) , true ) :
if url != profile . profilePictureUrl {
profileChanges . append ( Profile . Columns . profilePictureUrl . set ( to : url ) )
avatarNeedsDownload = true
targetAvatarUrl = url
}
if key != profile . profileEncryptionKey && key . count = = ProfileManager . avatarAES256KeyByteLength {
profileChanges . append ( Profile . Columns . profileEncryptionKey . set ( to : key ) )
}
// P r o f i l e f i l e n a m e ( t h i s i s n ' t s y n c h r o n i z e d b e t w e e n d e v i c e s )
if let fileName : String = fileName {
profileChanges . append ( Profile . Columns . profilePictureFileName . set ( to : fileName ) )
// U p d a t e t h e ' l a s t P r o f i l e P i c t u r e U p d a t e ' t i m e s t a m p f o r e i t h e r e x t e r n a l o r l o c a l c h a n g e s
profileChanges . append ( Profile . Columns . lastProfilePictureUpdate . set ( to : sentTimestamp ) )
}
// I f w e h a v e a l r e a d y d o w n l o a d e d t h e i m a g e t h e n n o n e e d t o d o w n l o a d i t a g a i n
avatarNeedsDownload = (
avatarNeedsDownload &&
! ProfileManager . hasProfileImageData ( with : fileName )
)
}
// U p d a t e t h e ' l a s t P r o f i l e P i c t u r e U p d a t e ' t i m e s t a m p f o r e i t h e r e x t e r n a l o r l o c a l c h a n g e s
profileChanges . append ( Profile . Columns . lastProfilePictureUpdate . set ( to : sentTimestamp ) )
// D o n ' t w a n t p r o f i l e s i n m e s s a g e s t o m o d i f y t h e c u r r e n t u s e r s p r o f i l e i n f o s o i g n o r e t h o s e c a s e s
default : break
}
// P e r s i s t a n y c h a n g e s
Morgan Pretty
7 months ago