Добавить opinion-связи и обновить UI связей в профиле

2026-05-20 13:13:50 +03:00
parent a53444b863
commit aa35d87885
18 changed files with 452 additions and 49 deletions
@@ -66,6 +66,15 @@ public final class DatabaseInitializer {
    public static final short CONNECTION_SIBLING    = 54;
    public static final short CONNECTION_UNSIBLING  = 55;

+    public static final short CONNECTION_KNOWN_PERSON    = 60;
+    public static final short CONNECTION_UNKNOWN_PERSON  = 61;
+
+    public static final short CONNECTION_SHINE_CONFIRMED   = 70;
+    public static final short CONNECTION_SHINE_UNCONFIRMED = 71;
+
+    public static final short CONNECTION_SHINE_SEEN   = 74;
+    public static final short CONNECTION_SHINE_UNSEEN = 75;
+
    public static void createNewDB(String[] args) {
        AppConfig config = AppConfig.getInstance();
        String dbPath = config.getParam("db.path");
@@ -198,6 +198,9 @@ public final class DatabaseTriggersInstaller {
        int PARENT     = (int) DatabaseInitializer.CONNECTION_PARENT;
        int CHILD      = (int) DatabaseInitializer.CONNECTION_CHILD;
        int SIBLING    = (int) DatabaseInitializer.CONNECTION_SIBLING;
+        int KNOWN      = (int) DatabaseInitializer.CONNECTION_KNOWN_PERSON;
+        int SHINE_CONF = (int) DatabaseInitializer.CONNECTION_SHINE_CONFIRMED;
+        int SHINE_SEEN = (int) DatabaseInitializer.CONNECTION_SHINE_SEEN;

        int UNFRIEND   = (int) DatabaseInitializer.CONNECTION_UNFRIEND;
        int UNCONTACT  = (int) DatabaseInitializer.CONNECTION_UNCONTACT;
@@ -206,13 +209,16 @@ public final class DatabaseTriggersInstaller {
        int UNPARENT   = (int) DatabaseInitializer.CONNECTION_UNPARENT;
        int UNCHILD    = (int) DatabaseInitializer.CONNECTION_UNCHILD;
        int UNSIBLING  = (int) DatabaseInitializer.CONNECTION_UNSIBLING;
+        int UNKNOWN    = (int) DatabaseInitializer.CONNECTION_UNKNOWN_PERSON;
+        int SHINE_UNCONF = (int) DatabaseInitializer.CONNECTION_SHINE_UNCONFIRMED;
+        int SHINE_UNSEEN = (int) DatabaseInitializer.CONNECTION_SHINE_UNSEEN;

        st.executeUpdate("""
            CREATE TRIGGER IF NOT EXISTS trg_blocks_connection_state_ai
            AFTER INSERT ON blocks
            WHEN NEW.msg_type = 3
            BEGIN
-                -- FRIEND/CONTACT/FOLLOW/SPOUSE/PARENT/CHILD/SIBLING:
+                -- FRIEND/CONTACT/FOLLOW/SPOUSE/PARENT/CHILD/SIBLING/KNOWN_PERSON/SHINE_*:
                -- 1) РµСЃР»Рё Р·Р°РїРёСЃРё РЅРµС‚ вЂ” СЃРѕР·РґР°С‘Рј
                INSERT OR IGNORE INTO connections_state (
                    login, rel_type, to_login, to_bch_name, to_block_number, to_block_hash
@@ -233,7 +239,7 @@ public final class DatabaseTriggersInstaller {
                    NEW.to_bch_name,
                    NEW.to_block_number,
                    NEW.to_block_hash
-                WHERE NEW.msg_sub_type IN (%d, %d, %d, %d, %d, %d, %d)
+                WHERE NEW.msg_sub_type IN (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)
                  AND COALESCE(
                      NEW.to_login,
                      CASE
@@ -264,7 +270,7 @@ public final class DatabaseTriggersInstaller {
                          ELSE NULL
                      END
                  )
-                  AND NEW.msg_sub_type IN (%d, %d, %d, %d, %d, %d, %d)
+                  AND NEW.msg_sub_type IN (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)
                  AND COALESCE(
                      NEW.to_login,
                      CASE
@@ -277,7 +283,7 @@ public final class DatabaseTriggersInstaller {
                  ) IS NOT NULL
                  AND NEW.to_bch_name IS NOT NULL;

-                -- UNFRIEND/UNCONTACT/UNFOLLOW/UNSPOUSE/UNPARENT/UNCHILD/UNSIBLING:
+                -- UNFRIEND/UNCONTACT/UNFOLLOW/UNSPOUSE/UNPARENT/UNCHILD/UNSIBLING/UNKNOWN_PERSON/SHINE_UN*:
                -- СѓРґР°Р»СЏРµРј СЃРѕРѕС‚РІРµС‚СЃС‚РІСѓСЋС‰РµРµ "РїРѕР·РёС‚РёРІРЅРѕРµ" СЃРѕСЃС‚РѕСЏРЅРёРµ
                DELETE FROM connections_state
                WHERE login = NEW.login
@@ -299,6 +305,9 @@ public final class DatabaseTriggersInstaller {
                      WHEN %d THEN %d
                      WHEN %d THEN %d
                      WHEN %d THEN %d
+                      WHEN %d THEN %d
+                      WHEN %d THEN %d
+                      WHEN %d THEN %d
                      ELSE rel_type
                  END
                  AND COALESCE(
@@ -311,11 +320,11 @@ public final class DatabaseTriggersInstaller {
                          ELSE NULL
                      END
                  ) IS NOT NULL
-                  AND NEW.msg_sub_type IN (%d, %d, %d, %d, %d, %d, %d);
+                  AND NEW.msg_sub_type IN (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d);
            END;
            """.formatted(
-                FRIEND, CONTACT, FOLLOW, SPOUSE, PARENT, CHILD, SIBLING,
-                FRIEND, CONTACT, FOLLOW, SPOUSE, PARENT, CHILD, SIBLING,
+                FRIEND, CONTACT, FOLLOW, SPOUSE, PARENT, CHILD, SIBLING, KNOWN, SHINE_CONF, SHINE_SEEN,
+                FRIEND, CONTACT, FOLLOW, SPOUSE, PARENT, CHILD, SIBLING, KNOWN, SHINE_CONF, SHINE_SEEN,

                UNFRIEND,  FRIEND,
                UNCONTACT, CONTACT,
@@ -324,8 +333,11 @@ public final class DatabaseTriggersInstaller {
                UNPARENT,  PARENT,
                UNCHILD,   CHILD,
                UNSIBLING, SIBLING,
+                UNKNOWN,   KNOWN,
+                SHINE_UNCONF, SHINE_CONF,
+                SHINE_UNSEEN, SHINE_SEEN,

-                UNFRIEND, UNCONTACT, UNFOLLOW, UNSPOUSE, UNPARENT, UNCHILD, UNSIBLING
+                UNFRIEND, UNCONTACT, UNFOLLOW, UNSPOUSE, UNPARENT, UNCHILD, UNSIBLING, UNKNOWN, SHINE_UNCONF, SHINE_UNSEEN
            ));
    }

@@ -40,8 +40,10 @@ public final class MsgSubType {
    /* ===================== CONNECTION (msg_type=3) ===================== */
    /**
 * Совпадает с ConnectionBody:
- * SET:   CLOSE_FRIEND(=FRIEND)=10, CONTACT=20, FOLLOW=30, SPOUSE=40, PARENT=50, CHILD=52, SIBLING=54
- * UNSET: UNCLOSE_FRIEND(=UNFRIEND)=11, UNCONTACT=21, UNFOLLOW=31, UNSPOUSE=41, UNPARENT=51, UNCHILD=53, UNSIBLING=55
+ * SET:   CLOSE_FRIEND(=FRIEND)=10, CONTACT=20, FOLLOW=30, SPOUSE=40, PARENT=50, CHILD=52, SIBLING=54,
+ *        KNOWN_PERSON=60, SHINE_CONFIRMED=70, SHINE_SEEN=74
+ * UNSET: UNCLOSE_FRIEND(=UNFRIEND)=11, UNCONTACT=21, UNFOLLOW=31, UNSPOUSE=41, UNPARENT=51, UNCHILD=53, UNSIBLING=55,
+ *        UNKNOWN_PERSON=61, SHINE_UNCONFIRMED=71, SHINE_UNSEEN=75
     */

    /** Добавить в близкие друзья (close friend). */
@@ -92,6 +94,24 @@ public final class MsgSubType {
    /** Удалить связь "брат/сестра". */
    public static final short CONNECTION_UNSIBLING = 55;

+    /** Просто знаю этого человека. */
+    public static final short CONNECTION_KNOWN_PERSON = 60;
+
+    /** Не знаю этого человека. */
+    public static final short CONNECTION_UNKNOWN_PERSON = 61;
+
+    /** Точно уверен, что сияющий. */
+    public static final short CONNECTION_SHINE_CONFIRMED = 70;
+
+    /** Не подтверждаю, что сияющий. */
+    public static final short CONNECTION_SHINE_UNCONFIRMED = 71;
+
+    /** Мало знаком, но видел сияющим. */
+    public static final short CONNECTION_SHINE_SEEN = 74;
+
+    /** Не отмечаю, что видел сияющим. */
+    public static final short CONNECTION_SHINE_UNSEEN = 75;
+
    /* ===================== USER_PARAM (msg_type=4) ===================== */

    /** Параметр профиля key/value (обе строки). */