aidar/SHiNE-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(relations): spouse 40/41 и новый UX вкладки Связи (проверено)

Browse Source
This commit is contained in:
AidarKC
2026-04-26 18:24:30 +03:00
parent 3e10407afd
commit 1fec6c7b54
12 changed files with 292 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_GetUserConnectionsGraph_Handler.java
+7 -1
View File
@@ -46,6 +46,8 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
List<String> inContacts = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CONTACT);
List<String> outFollows = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_FOLLOW);
List<String> inFollows = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_FOLLOW);
List<String> outSpouses = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SPOUSE);
List<String> inSpouses = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SPOUSE);
List<String> outParents = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_PARENT);
List<String> inParents = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_PARENT);
List<String> outChildren = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CHILD);
@@ -56,9 +58,10 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
LinkedHashSet<String> allLogins = new LinkedHashSet<>();
allLogins.add(canonicalLogin);
addAllLogins(allLogins, outFriends, inFriends, outContacts, inContacts, outFollows, inFollows,
outParents, inParents, outChildren, inChildren, outSiblings, inSiblings);
outSpouses, inSpouses, outParents, inParents, outChildren, inChildren, outSiblings, inSiblings);
Map<String, UserMeta> metaByLogin = loadUserMeta(c, allLogins);
List<String> spouseLogins = mergeUnique(outSpouses, inSpouses);
List<String> parentLogins = mergeUnique(outParents, inChildren);
List<String> childLogins = mergeUnique(outChildren, inParents);
List<String> siblingLogins = mergeUnique(outSiblings, inSiblings);
@@ -74,6 +77,8 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
resp.setInContacts(inContacts);
resp.setOutFollows(outFollows);
resp.setInFollows(inFollows);
resp.setOutSpouses(outSpouses);
resp.setInSpouses(inSpouses);
resp.setOutParents(outParents);
resp.setInParents(inParents);
resp.setOutChildren(outChildren);
@@ -83,6 +88,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
resp.setParents(toRelativeItems(parentLogins, metaByLogin));
resp.setChildren(toRelativeItems(childLogins, metaByLogin));
resp.setSiblings(toRelativeItems(siblingLogins, metaByLogin));
resp.setSpouses(toRelativeItems(spouseLogins, metaByLogin));
resp.setAllUsers(toUserMarkItems(allLogins, metaByLogin));
return resp;
}
shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_GetUserConnectionsGraph_Response.java
+9
View File
@@ -13,6 +13,8 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
private List<String> inContacts = new ArrayList<>();
private List<String> outFollows = new ArrayList<>();
private List<String> inFollows = new ArrayList<>();
private List<String> outSpouses = new ArrayList<>();
private List<String> inSpouses = new ArrayList<>();
private List<String> outParents = new ArrayList<>();
private List<String> inParents = new ArrayList<>();
private List<String> outChildren = new ArrayList<>();
@@ -22,6 +24,7 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
private List<RelativeItem> parents = new ArrayList<>();
private List<RelativeItem> children = new ArrayList<>();
private List<RelativeItem> siblings = new ArrayList<>();
private List<RelativeItem> spouses = new ArrayList<>();
private List<UserMarkItem> allUsers = new ArrayList<>();
public static class AvatarItem {
@@ -83,6 +86,10 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
public void setOutFollows(List<String> outFollows) { this.outFollows = outFollows; }
public List<String> getInFollows() { return inFollows; }
public void setInFollows(List<String> inFollows) { this.inFollows = inFollows; }
public List<String> getOutSpouses() { return outSpouses; }
public void setOutSpouses(List<String> outSpouses) { this.outSpouses = outSpouses; }
public List<String> getInSpouses() { return inSpouses; }
public void setInSpouses(List<String> inSpouses) { this.inSpouses = inSpouses; }
public List<String> getOutParents() { return outParents; }
public void setOutParents(List<String> outParents) { this.outParents = outParents; }
public List<String> getInParents() { return inParents; }
@@ -101,6 +108,8 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
public void setChildren(List<RelativeItem> children) { this.children = children; }
public List<RelativeItem> getSiblings() { return siblings; }
public void setSiblings(List<RelativeItem> siblings) { this.siblings = siblings; }
public List<RelativeItem> getSpouses() { return spouses; }
public void setSpouses(List<RelativeItem> spouses) { this.spouses = spouses; }
public List<UserMarkItem> getAllUsers() { return allUsers; }
public void setAllUsers(List<UserMarkItem> allUsers) { this.allUsers = allUsers; }
}