Early preparations for PNP Contact Merging
This commit is contained in:
		
					parent
					
						
							
								2f5dd73e58
							
						
					
				
			
			
				commit
				
					
						faf6c41332
					
				
			
		
					 30 changed files with 1572 additions and 447 deletions
				
			
		| 
						 | 
				
			
			@ -103,12 +103,10 @@ export class MessageRequests extends Collection<MessageRequestModel> {
 | 
			
		|||
        conversation = window.ConversationController.get(groupId);
 | 
			
		||||
      }
 | 
			
		||||
      if (!conversation && (threadE164 || threadUuid)) {
 | 
			
		||||
        conversation = window.ConversationController.get(
 | 
			
		||||
          window.ConversationController.ensureContactIds({
 | 
			
		||||
            e164: threadE164,
 | 
			
		||||
            uuid: threadUuid,
 | 
			
		||||
          })
 | 
			
		||||
        );
 | 
			
		||||
        conversation = window.ConversationController.lookupOrCreate({
 | 
			
		||||
          e164: threadE164,
 | 
			
		||||
          uuid: threadUuid,
 | 
			
		||||
        });
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      if (!conversation) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue