zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Restored compatability with envoy-common

Browse Source 
additionally added NameChangeProcessor
This commit is contained in:
delvh
2020-04-02 16:32:23 +02:00
parent 198ba2a52d
commit e6cf3af745
12 changed files with 175 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/envoy/server/processors/LoginCredentialProcessor.java
View File

@ -1,16 +1,11 @@
package envoy.server.processors;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.InputMismatchException;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import javax.persistence.NoResultException;
import envoy.data.Contacts;
import envoy.data.LoginCredentials;
import envoy.data.Message.MessageStatus;
import envoy.data.User;
@ -57,8 +52,8 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
UserStatusChangeProcessor.updateUserStatus(user);
// Create contacts
Contacts contacts = new Contacts(user.getContacts().stream().map(envoy.server.data.User::toCommon).collect(Collectors.toList()));
contacts.getContacts().add(user.toCommon());
var contacts = user.getContacts().stream().map(envoy.server.data.Contact::toCommon).collect(Collectors.toList());
contacts.add(user.toCommon());
// Complete handshake
System.out.println("Sending user...");
@ -143,7 +138,7 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
user.setLastSeen(new Date());
user.setStatus(User.UserStatus.ONLINE);
user.setPasswordHash(credentials.getPasswordHash());
user.setContacts(new ArrayList<>());
user.setContacts(new HashSet<>());
persistenceManager.addContact(user);
return user;
}