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

fixes #129 - contacts are now sent as a part of the user

Browse Source 
(if they were not already)...
Additionally renamed some methods named `...Id()` to `...ID()`
This commit is contained in:
delvh
2020-04-06 22:55:27 +02:00
parent afc55a3050
commit 4e385396ad
16 changed files with 139 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,7 @@
package envoy.server.processors;
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.InputMismatchException;
import java.util.List;
import java.util.stream.Collectors;
import java.util.*;
import javax.persistence.NoResultException;
@ -56,18 +51,12 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
user.setStatus(UserStatus.ONLINE);
UserStatusChangeProcessor.updateUserStatus(user);
// Create contacts
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...");
writeProxy.write(socketID, user.toCommon());
System.out.println("Sending contacts...");
writeProxy.write(socketID, contacts);
System.out.println("Acquiring pending messages for the client...");
List<Message> pendingMessages = PersistenceManager.getInstance().getPendingMessages(user);
for (Message msg : pendingMessages) {
for (Message msg : pendingMessages)
if (msg.getStatus() == MessageStatus.SENT) {
System.out.println("Sending message " + msg.toCommonMessage());
writeProxy.write(socketID, msg.toCommonMessage());
@ -79,7 +68,6 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
System.out.println("Sending messageStatusChangeEvent " + evt);
writeProxy.write(socketID, evt);
}
}
}
@Override