Merge branch 'main' into add-offline-notify

2025-06-03 23:35:35 +02:00
parent 71522973a7 c30f24ab8f
commit c920664920
118 changed files with 2585 additions and 506 deletions
@@ -30,7 +30,6 @@ import java.util.zip.GZIPInputStream;
@AllArgsConstructor
@Getter
 public class NodeData {
-
    static {
        new SqlTypeMapper<>(PipedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("PipedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
        new SqlTypeMapper<>(ByteArrayInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("ByteArrayInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
@@ -1,7 +1,7 @@
 /*
 * This file is a part of the SteamWar software.
 *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2025  SteamWar.de-Serverteam
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
@@ -31,10 +31,13 @@ public class SchematicNode {

    static {
        SchematicType.Normal.name(); // Ensure SchematicType is loaded.
-        new SqlTypeMapper<>(SchematicNode.class, null, (rs, identifier) -> { throw new SecurityException("SchematicNode cannot be used as type (recursive select)"); }, (st, index, value) -> st.setInt(index, value.nodeId));
+        new SqlTypeMapper<>(SchematicNode.class, null, (rs, identifier) -> {
+            throw new SecurityException("SchematicNode cannot be used as type (recursive select)");
+        }, (st, index, value) -> st.setInt(index, value.nodeId));
    }

    private static final Map<Integer, Map<String, List<String>>> TAB_CACHE = new HashMap<>();
+
    public static void clear() {
        TAB_CACHE.clear();
    }
@@ -42,39 +45,60 @@ public class SchematicNode {
    private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode ";

    private static final Table<SchematicNode> table = new Table<>(SchematicNode.class);
-    private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem", "NodeType");
-    private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem", "NodeType", "NodeRank", "ReplaceColor", "AllowReplay");
+    private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem",
+            "NodeType");
+    private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem",
+            "NodeType", "NodeRank", "ReplaceColor", "AllowReplay");
    private static final Statement delete = table.delete(Table.PRIMARY);

-    private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table, nodeSelector + "WHERE NodeId = ?");
-    private static final SelectStatement<SchematicNode> byOwnerNameParent = new SelectStatement<>(table, nodeSelector + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode " + Statement.NULL_SAFE_EQUALS + "?");
-    private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table, nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeType is NULL ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table, nodeSelector + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table, nodeSelector + "WHERE NodeType = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table, "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId " + Statement.NULL_SAFE_EQUALS + "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table, "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId " + Statement.NULL_SAFE_EQUALS + "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
-    private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table, "SELECT COUNT(DISTINCT NodeId) FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND NodeId = ?");
-    private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table, "WITH RECURSIVE RSASN AS(WITH RECURSIVE RSAN AS (WITH RSANH AS (WITH RECURSIVE RSA AS (SELECT SN.NodeId, NM.ParentId FROM SchematicNode SN LEFT JOIN NodeMember NM on SN.NodeId = NM.NodeId WHERE NM.UserId = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN INNER JOIN RSA ON RSA.NodeId = SN.ParentNode) SELECT * FROM RSA UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?) SELECT * FROM RSANH UNION SELECT SN.NodeId, SN.ParentNode FROM RSANH JOIN SchematicNode SN ON SN.ParentNode = RSANH.NodeId) SELECT RSAN.NodeId, RSAN.ParentId FROM RSAN JOIN SchematicNode SN ON SN.NodeId = RSAN.NodeId WHERE NodeType = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN JOIN RSASN ON SN.NodeId = RSASN.ParentId) SELECT SN.*, ? as EffectiveOwner, RSASN.ParentId AS ParentNode FROM RSASN JOIN SchematicNode SN ON SN.NodeId = RSASN.NodeId WHERE RSASN.ParentId" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
-    private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table, "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?");
-    private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table, "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE NodeId = ?");
-    private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table, "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
+    private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table,
+            nodeSelector + "WHERE NodeId = ?");
+    private static final SelectStatement<SchematicNode> byOwnerNameParent = new SelectStatement<>(table,
+            nodeSelector + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode " + Statement.NULL_SAFE_EQUALS + "?");
+    private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table,
+            nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelector
+            + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeType is NULL ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table,
+            nodeSelector + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table,
+            nodeSelector + "WHERE NodeType = ? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table,
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId");
+    private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table,
+            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
+                    + Statement.NULL_SAFE_EQUALS
+                    + "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table,
+            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
+                    + Statement.NULL_SAFE_EQUALS
+                    + "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
+    private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table,
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?");
+    private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table,
+            "WITH RECURSIVE RSASN AS(WITH RECURSIVE RSAN AS (WITH RSANH AS (WITH RECURSIVE RSA AS (SELECT SN.NodeId, NM.ParentId FROM SchematicNode SN LEFT JOIN NodeMember NM on SN.NodeId = NM.NodeId WHERE NM.UserId = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN INNER JOIN RSA ON RSA.NodeId = SN.ParentNode) SELECT * FROM RSA UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?) SELECT * FROM RSANH UNION SELECT SN.NodeId, SN.ParentNode FROM RSANH JOIN SchematicNode SN ON SN.ParentNode = RSANH.NodeId) SELECT RSAN.NodeId, RSAN.ParentId FROM RSAN JOIN SchematicNode SN ON SN.NodeId = RSAN.NodeId WHERE NodeType = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN JOIN RSASN ON SN.NodeId = RSASN.ParentId) SELECT SN.*, ? as EffectiveOwner, RSASN.ParentId AS ParentNode FROM RSASN JOIN SchematicNode SN ON SN.NodeId = RSASN.NodeId WHERE RSASN.ParentId"
+                    + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
+    private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table,
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?");
+    private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table,
+            "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE NodeId = ?");
+    private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table,
+            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");

    static {
        NodeMember.init();
    }

-    @Field(keys = {Table.PRIMARY}, autoincrement = true)
+    @Field(keys = { Table.PRIMARY }, autoincrement = true)
    private final int nodeId;
-    @Field(keys = {"OwnerNameParent"})
+    @Field(keys = { "OwnerNameParent" })
    private final int nodeOwner;
    @Field(def = "0")
    @Getter
    private final int effectiveOwner;
-    @Field(keys = {"OwnerNameParent"})
+    @Field(keys = { "OwnerNameParent" })
    private String nodeName;
-    @Field(keys = {"OwnerNameParent"}, nullable = true)
+    @Field(keys = { "OwnerNameParent" }, nullable = true)
    private Integer parentNode;
    @Field(def = "CURRENT_TIMESTAMP")
    private Timestamp lastUpdate;
@@ -102,8 +126,7 @@ public class SchematicNode {
            SchematicType nodeType,
            int nodeRank,
            boolean replaceColor,
-            boolean allowReplay
-    ) {
+            boolean allowReplay) {
        this.nodeId = nodeId;
        this.nodeOwner = nodeOwner;
        this.effectiveOwner = effectiveOwner;
@@ -118,7 +141,7 @@ public class SchematicNode {
    }

    public static List<SchematicNode> getAll(SteamwarUser user) {
-        return all.listSelect(user);
+        return all.listSelect(user, user, user);
    }

    public static Map<Integer, List<SchematicNode>> getAllMap(SteamwarUser user) {
@@ -130,7 +153,8 @@ public class SchematicNode {
    }

    public static SchematicNode byParentName(SteamwarUser user, Integer schematicId, String name) {
-        return byParentName.select(user, schematicId, user, name, user, schematicId, user, schematicId, schematicId, name);
+        return byParentName.select(user, schematicId, user, name, user, schematicId, user, schematicId, schematicId,
+                name);
    }

    public static List<SchematicNode> accessibleByUserType(SteamwarUser user, SchematicType type) {
@@ -142,10 +166,11 @@ public class SchematicNode {
    }

    public static boolean schematicAccessibleForUser(SteamwarUser user, Integer schematicId) {
-        return schematicAccessibleForUser.select(user, schematicId) != null;
+        return schematicAccessibleForUser.select(user, user, user, schematicId) != null;
    }

-    public static List<SchematicNode> accessibleByUserTypeParent(SteamwarUser user, SchematicType type, Integer parentId) {
+    public static List<SchematicNode> accessibleByUserTypeParent(SteamwarUser user, SchematicType type,
+            Integer parentId) {
        return accessibleByUserTypeInParent.listSelect(user, user, type, user, parentId);
    }

@@ -160,7 +185,8 @@ public class SchematicNode {
    private static Map<Integer, List<SchematicNode>> map(List<SchematicNode> in) {
        Map<Integer, List<SchematicNode>> map = new HashMap<>();
        for (SchematicNode effectiveSchematicNode : in) {
-            map.computeIfAbsent(effectiveSchematicNode.getOptionalParent().orElse(0), k -> new ArrayList<>()).add(effectiveSchematicNode);
+            map.computeIfAbsent(effectiveSchematicNode.getOptionalParent().orElse(0), k -> new ArrayList<>())
+                    .add(effectiveSchematicNode);
        }
        return map;
    }
@@ -218,7 +244,8 @@ public class SchematicNode {
        return byId.select(id);
    }

-    public static List<SchematicNode> getAccessibleSchematicsOfTypeInParent(int owner, String schemType, Integer parent) {
+    public static List<SchematicNode> getAccessibleSchematicsOfTypeInParent(int owner, String schemType,
+            Integer parent) {
        return accessibleByUserTypeParent(SteamwarUser.get(owner), SchematicType.fromDB(schemType), parent);
    }

@@ -283,10 +310,12 @@ public class SchematicNode {
        }
        if (s.contains("/")) {
            String[] layers = s.split("/");
-            Optional<SchematicNode> currentNode = Optional.ofNullable(SchematicNode.byParentName(user, null, layers[0]));
+            Optional<SchematicNode> currentNode = Optional
+                    .ofNullable(SchematicNode.byParentName(user, null, layers[0]));
            for (int i = 1; i < layers.length; i++) {
                int finalI = i;
-                Optional<SchematicNode> node = currentNode.map(effectiveSchematicNode -> SchematicNode.byParentName(user, effectiveSchematicNode.getId(), layers[finalI]));
+                Optional<SchematicNode> node = currentNode.map(effectiveSchematicNode -> SchematicNode
+                        .byParentName(user, effectiveSchematicNode.getId(), layers[finalI]));
                if (!node.isPresent()) {
                    return null;
                } else {
@@ -365,7 +394,7 @@ public class SchematicNode {

    @Deprecated
    public void setType(String type) {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Node is Directory");
        this.nodeType = SchematicType.fromDB(type);
        updateDB();
@@ -376,13 +405,13 @@ public class SchematicNode {
    }

    public String getFileEnding() {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Node is Directory");
        return NodeData.get(this).getNodeFormat().getFileEnding();
    }

    public int getRank() {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Node is Directory");
        return nodeRank;
    }
@@ -393,19 +422,19 @@ public class SchematicNode {
    }

    public void setRank(int rank) {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Node is Directory");
        this.nodeRank = rank;
    }

    public SchematicType getSchemtype() {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Is Directory");
        return nodeType;
    }

    public void setSchemtype(SchematicType type) {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Is Directory");
        this.nodeType = type;
        updateDB();
@@ -416,7 +445,7 @@ public class SchematicNode {
    }

    public void setReplaceColor(boolean replaceColor) {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Is Directory");
        this.replaceColor = replaceColor;
        updateDB();
@@ -427,14 +456,15 @@ public class SchematicNode {
    }

    public void setAllowReplay(boolean allowReplay) {
-        if(isDir())
+        if (isDir())
            throw new SecurityException("Is Directory");
        this.allowReplay = allowReplay;
        updateDB();
    }

    public SchematicNode getParentNode() {
-        if(parentNode == null) return null;
+        if (parentNode == null)
+            return null;
        return SchematicNode.getSchematicNode(parentNode);
    }

@@ -486,7 +516,7 @@ public class SchematicNode {
    }

    public String generateBreadcrumbs() {
-        if(brCache == null) {
+        if (brCache == null) {
            brCache = generateBreadcrumbs("/");
        }
        return brCache;
@@ -495,11 +525,15 @@ public class SchematicNode {
    public String generateBreadcrumbs(String split) {
        StringBuilder builder = new StringBuilder(getName());
        Optional<SchematicNode> currentNode = Optional.of(this);
-        if(currentNode.map(SchematicNode::isDir).orElse(false)) {
+        if (currentNode.map(SchematicNode::isDir).orElse(false)) {
            builder.append(split);
        }
        while (currentNode.isPresent()) {
-            currentNode = currentNode.flatMap(schematicNode -> Optional.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner)).map(NodeMember::getParent).orElse(schematicNode.getOptionalParent())).map(SchematicNode::getSchematicNode);
+            currentNode = currentNode
+                    .flatMap(schematicNode -> Optional
+                            .ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner))
+                            .map(NodeMember::getParent).orElse(schematicNode.getOptionalParent()))
+                    .map(SchematicNode::getSchematicNode);
            currentNode.ifPresent(node -> builder.insert(0, split).insert(0, node.getName()));
        }
        return builder.toString();
@@ -508,17 +542,22 @@ public class SchematicNode {
    public List<Map.Entry<String, Integer>> generateBreadcrumbsMap(SteamwarUser user) {
        List<Map.Entry<String, Integer>> map = new ArrayList<>();
        Optional<SchematicNode> currentNode = Optional.of(this);
-        if(currentNode.map(SchematicNode::isDir).orElse(false)) {
+        if (currentNode.map(SchematicNode::isDir).orElse(false)) {
            map.add(new AbstractMap.SimpleEntry<>(getName(), getId()));
        }
        while (currentNode.isPresent()) {
-            currentNode = currentNode.flatMap(schematicNode -> Optional.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner)).map(NodeMember::getParent).orElse(schematicNode.getOptionalParent())).map(SchematicNode::getSchematicNode);
+            currentNode = currentNode
+                    .flatMap(schematicNode -> Optional
+                            .ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner))
+                            .map(NodeMember::getParent).orElse(schematicNode.getOptionalParent()))
+                    .map(SchematicNode::getSchematicNode);
            currentNode.ifPresent(node -> map.add(0, new AbstractMap.SimpleEntry<>(node.getName(), node.getId())));
        }
        return map;
    }

    private static final List<String> FORBIDDEN_NAMES = Collections.unmodifiableList(Arrays.asList("public"));
+
    public static boolean invalidSchemName(String[] layers) {
        for (String layer : layers) {
            if (layer.isEmpty()) {
@@ -535,7 +574,7 @@ public class SchematicNode {
                    layer.contains(" ")) {
                return true;
            }
-            if(FORBIDDEN_NAMES.contains(layer.toLowerCase())) {
+            if (FORBIDDEN_NAMES.contains(layer.toLowerCase())) {
                return true;
            }
        }
@@ -549,14 +588,15 @@ public class SchematicNode {
        }
        int index = s.lastIndexOf("/");
        String cacheKey = index == -1 ? "" : s.substring(0, index);
-        if(TAB_CACHE.containsKey(user.getId()) && TAB_CACHE.get(user.getId()).containsKey(cacheKey)) {
+        if (TAB_CACHE.containsKey(user.getId()) && TAB_CACHE.get(user.getId()).containsKey(cacheKey)) {
            return new ArrayList<>(TAB_CACHE.get(user.getId()).get(cacheKey));
        }
        List<String> list = new ArrayList<>();
        if (s.contains("/")) {
            String preTab = s.substring(0, s.lastIndexOf("/") + 1);
            SchematicNode pa = SchematicNode.getNodeFromPath(user, preTab);
-            if (pa == null) return new ArrayList<>();
+            if (pa == null)
+                return new ArrayList<>();
            List<SchematicNode> nodes = SchematicNode.list(user, pa.getId());
            String br = pa.generateBreadcrumbs();
            nodes.forEach(node -> list.add((sws ? "/" : "") + br + node.getName() + (node.isDir() ? "/" : "")));
@@ -75,15 +75,7 @@ public class UserElo {

    public static void setElo(int userId, String gameMode, int elo) {
        emblemCache.remove(userId);
-
-        int oldPlacement = getPlacement(getElo(userId, gameMode).orElse(0), gameMode);
-        int newPlacement = getPlacement(elo, gameMode);
-
        gameModeUserEloCache.getOrDefault(gameMode, Collections.emptyMap()).remove(userId);
-        if (oldPlacement <= 3 || newPlacement <= 3) {
-            emblemCache.clear();
-        }
-
        setElo.update(Season.getSeason(), gameMode, userId, elo);
    }

@@ -112,27 +104,17 @@ public class UserElo {
    public static String getEmblemProgression(String gameMode, int userId) {
        switch (getProgression(userId, gameMode)) {
            case -1:
-                return "§f/ §8∨ ∧ ∨ ∧ ∨ ∧ ❂ III II I";
+                return "§8❱❱❱❱ ❂";
            case 0:
-                return "§8/ §6∨ §8∧ ∨ ∧ ∨ ∧ ❂ III II I";
+                return "§e❱§8❱❱❱ ❂";
            case 1:
-                return "§8/ ∨ §6∧ §8∨ ∧ ∨ ∧ ❂ III II I";
+                return "§e❱❱§8❱❱ ❂";
            case 2:
-                return "§8/ ∨ ∧ §7∨ §8∧ ∨ ∧ ❂ III II I";
+                return "§e❱❱❱§8❱ ❂";
            case 3:
-                return "§8/ ∨ ∧ ∨ §7∧ §8∨ ∧ ❂ III II I";
+                return "§e❱❱❱❱§8 ❂";
            case 4:
-                return "§8/ ∨ ∧ ∨ ∧ §e∨ §8∧ ❂ III II I";
-            case 5:
-                return "§8/ ∨ ∧ ∨ ∧ ∨ §e∧ §8❂ III II I";
-            case 6:
-                return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ §5❂ §8III II I";
-            case 7:
-                return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ ❂ §5III §8II I";
-            case 8:
-                return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ ❂ III §5II §8I";
-            case 9:
-                return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ ❂ III II §5I";
+                return "§8❱❱❱❱ §5❂";
            default:
                throw new SecurityException("Progression is not in range");
        }
@@ -142,19 +124,11 @@ public class UserElo {
        int elo = getElo(userId, gameMode).orElse(-1);
        if (elo < 0) return -1;

-        if (elo <= 100) return 0;
-        if (elo <= 200) return 1;
-        if (elo <= 400) return 2;
-        if (elo <= 600) return 3;
-        if (elo <= 900) return 4;
-        if (elo <= 1200) return 5;
-
-        int placement = getPlacement(elo, gameMode);
-        if (placement == 1) return 9;
-        if (placement == 2) return 8;
-        if (placement == 3) return 7;
-
-        return 6;
+        if (elo < 150) return 0;
+        if (elo < 350) return 1;
+        if (elo < 600) return 2;
+        if (elo < 900) return 3;
+        return 4;
    }

    public static String toEmblem(int progression) {
@@ -162,25 +136,15 @@ public class UserElo {
            case -1:
                return "";
            case 0:
-                return "§6∨ ";
+                return "§e❱ ";
            case 1:
-                return "§6∧ ";
+                return "§e❱❱ ";
            case 2:
-                return "§7∨ ";
+                return "§e❱❱❱ ";
            case 3:
-                return "§7∧ ";
+                return "§e❱❱❱❱ ";
            case 4:
-                return "§e∨ ";
-            case 5:
-                return "§e∧ ";
-            case 6:
                return "§5❂ ";
-            case 7:
-                return "§5III ";
-            case 8:
-                return "§5II ";
-            case 9:
-                return "§5I ";
            default:
                throw new SecurityException("Progression out of range");
        }