ソースを参照

fixed propagation

psy 2 年 前
コミット
3cea7d33a2
7 ファイル変更190 行追加270 行削除
  1. 162 247
      package-lock.json
  2. 7 6
      package.json
  3. 1 1
      src/index.js
  4. 12 5
      src/models.js
  5. 5 8
      src/server.js
  6. 1 1
      src/ssb/flotilla.js
  7. 2 2
      src/views/index.js

+ 162 - 247
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@krakenslab/oasis",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8835,19 +8835,6 @@
         }
       }
     },
-    "observ": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/observ/-/observ-0.2.0.tgz",
-      "integrity": "sha512-7SKbYTiFXMvqbeinO/GwTGtXSvbRq5AHKszmq5cx3fV7bKEjNCK7AdkhGzsuQAoT+IPf3mlxDmPrVW8wgshpcQ=="
-    },
-    "observ-debounce": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/observ-debounce/-/observ-debounce-1.1.1.tgz",
-      "integrity": "sha512-vP3EdCDE0+6tftznrvmmfI66qiOEkSV+zJ/TLo/3x5BZjm0a3I9A12V16iPck1v2cwAgGRPtWVF3vUmFN9vtPw==",
-      "requires": {
-        "observ": "~0.2.0"
-      }
-    },
     "obv": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/obv/-/obv-0.0.1.tgz",
@@ -12058,14 +12045,26 @@
       }
     },
     "ssb-bendy-butt": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-1.0.2.tgz",
-      "integrity": "sha512-PGIfYKLcpyKAGO6AS3BHctjxL58xK/DN6qmDBYVlxxqT+DI+482XYBCNKGtYfnCUlyBK+qO7lmbJp/DQhR8jmQ==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz",
+      "integrity": "sha512-8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w==",
       "requires": {
         "bencode": "^2.0.1",
-        "ssb-bfe": "^3.3.0",
-        "ssb-keys": "^8.4.0",
-        "ssb-uri2": "^2.0.0"
+        "is-canonical-base64": "^1.1.1",
+        "ssb-bfe": "^3.1.3",
+        "ssb-keys": "^8.2.0",
+        "ssb-ref": "^2.16.0",
+        "ssb-uri2": "^1.5.1"
+      },
+      "dependencies": {
+        "ssb-uri2": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.9.0.tgz",
+          "integrity": "sha512-HkgRbZeFe3YhBLfv5C6AgJaz1ESlQ5MP7sAdRTpCYwU4wo0U+d/irvVUsnUimPq6FO/Zn6gmW8BiCk+JBv3rGw==",
+          "requires": {
+            "ssb-typescript": "^2.5.0"
+          }
+        }
       }
     },
     "ssb-bfe": {
@@ -12425,21 +12424,22 @@
       }
     },
     "ssb-ebt": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-9.1.2.tgz",
-      "integrity": "sha512-nNR26/3da8e+39fARLFDhrNdbkycxvmXqoK7QxrHGJaY/opBGtZ7GaHjNKkaXcF4Fl04ee+NhkYaiq18pGI0RQ==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-8.2.1.tgz",
+      "integrity": "sha512-0Wi/Ma58GT06b2TJ2csDwtPubugFFNXJMeX+uh3R0aon4tzh02QCtxaq9vgfp1srgYl6g6a54r/5rUi1hy/KGQ==",
       "requires": {
         "base64-url": "^2.2.0",
         "epidemic-broadcast-trees": "^9.0.2",
         "key-value-file-store": "^1.1.1",
+        "promisify-4loc": "^1.0.0",
         "pull-defer": "^0.2.3",
         "pull-stream": "^3.6.0",
         "push-stream-to-pull-stream": "^1.0.5",
-        "ssb-bendy-butt": "^1.0.1",
-        "ssb-buttwoo": "^0.3.2",
-        "ssb-classic": "^1.1.0",
-        "ssb-index-feeds": "~0.10.1",
-        "ssb-network-errors": "^1.0.1"
+        "ssb-bendy-butt": "^0.12.5",
+        "ssb-network-errors": "^1.0.1",
+        "ssb-ref": "^2.13.0",
+        "ssb-subset-ql": "^0.6.4",
+        "ssb-uri2": "^2.0.0"
       }
     },
     "ssb-friend-pub": {
@@ -12453,48 +12453,24 @@
       }
     },
     "ssb-friends": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.7.tgz",
-      "integrity": "sha512-WPdHEWsAl9zMjbqQoFP++7UBi/lCKxiR0c8Qe2HHHoWIw58iVLSpepbNlZFwiZP4mPK5v2XaoYLOj7s3/UKj2w==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/ssb-friends/-/ssb-friends-5.1.7.tgz",
+      "integrity": "sha512-oBoMmcw5URa16CXM7LV1YG+YAGdwsQHkHevkh1VVKqhxxi8UAQ1qseb0iQ9Xdzwgadh9lRaW/aGz+175xrcxig==",
       "requires": {
-        "bipf": "^1.5.0",
+        "bipf": "^1.5.1",
         "flumecodec": "0.0.1",
         "flumeview-reduce": "^1.3.17",
-        "layered-graph": "^1.1.1",
+        "layered-graph": "^1.2.0",
+        "pull-cont": "^0.1.1",
         "pull-flatmap": "0.0.1",
         "pull-level": "^2.0.4",
         "pull-notify": "^0.1.1",
+        "pull-pushable": "^2.2.0",
         "pull-stream": "^3.6.0",
-        "ssb-db2": "^2.0.0",
-        "ssb-ref": "^2.7.1"
+        "ssb-db2": ">=4.1.0 <=6",
+        "ssb-ref": "^2.13.0"
       },
       "dependencies": {
-        "async-append-only-log": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.4.tgz",
-          "integrity": "sha512-mPh8K1iI2ysWCEXGFDnhFeRpkT4wl6mshO/KAzRpzU60oi2+RMGCVjTZ0hZAjIK5z+iDMj6NiITlt99qYmUScA==",
-          "requires": {
-            "debug": "^4.2.0",
-            "hashlru": "^2.3.0",
-            "lodash.debounce": "^4.0.8",
-            "looper": "^4.0.0",
-            "ltgt": "^2.2.1",
-            "mutexify": "^1.3.1",
-            "obz": "^1.0.2",
-            "polyraf": "^1.1.0",
-            "push-stream": "^11.0.0",
-            "push-stream-to-pull-stream": "^1.0.3"
-          }
-        },
-        "atomic-file-rw": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/atomic-file-rw/-/atomic-file-rw-0.2.2.tgz",
-          "integrity": "sha512-XZOcMIc32aIDxKFJGpYIPZ7H0p+Zmu3xAYyKDMmRgSQMNR97E8byl4tQa9vkYv4x8dNcYRQV8tw+KvtiKua0xQ==",
-          "requires": {
-            "idb-kv-store": "^4.5.0",
-            "mutexify": "^1.3.1"
-          }
-        },
         "flumecodec": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz",
@@ -12503,126 +12479,10 @@
             "level-codec": "^6.2.0"
           }
         },
-        "jitdb": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/jitdb/-/jitdb-4.1.0.tgz",
-          "integrity": "sha512-j6PZcTup+evIz+cVy8wDB6+GlV20/YvgDKCQtV7FBTBgYhl8FtpurUclcHz+C4OerMRosaKRX1doxTWgWoCmBQ==",
-          "requires": {
-            "atomic-file-rw": "^0.2.1",
-            "binary-search-bounds": "^2.0.4",
-            "bipf": "^1.5.4",
-            "crc": "3.6.0",
-            "debug": "^4.2.0",
-            "fastpriorityqueue": "^0.7.1",
-            "idb-kv-store": "^4.5.0",
-            "jsesc": "^3.0.2",
-            "mkdirp": "^1.0.4",
-            "multicb": "1.2.2",
-            "obz": "~1.0.3",
-            "promisify-4loc": "1.0.0",
-            "pull-async": "~1.0.0",
-            "pull-awaitable": "^1.0.0",
-            "pull-cat": "~1.1.11",
-            "pull-stream": "^3.6.14",
-            "push-stream": "^11.0.0",
-            "push-stream-to-pull-stream": "^1.0.3",
-            "sanitize-filename": "^1.6.3",
-            "traverse": "^0.6.6",
-            "typedarray-to-buffer": "^4.0.0",
-            "typedfastbitset": "~0.2.1"
-          },
-          "dependencies": {
-            "obz": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/obz/-/obz-1.0.3.tgz",
-              "integrity": "sha512-rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="
-            }
-          }
-        },
-        "jsesc": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-          "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="
-        },
         "level-codec": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz",
           "integrity": "sha512-J437PvCMZZKNT88+VRh6dkmh1ndZzwGwDzb5ZZl3QEsl+U9wIlt8hG+Y1gXVOhH75gf8JyceKGiG6WFUBbxyGQ=="
-        },
-        "ssb-bendy-butt": {
-          "version": "0.12.5",
-          "resolved": "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz",
-          "integrity": "sha512-8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w==",
-          "requires": {
-            "bencode": "^2.0.1",
-            "is-canonical-base64": "^1.1.1",
-            "ssb-bfe": "^3.1.3",
-            "ssb-keys": "^8.2.0",
-            "ssb-ref": "^2.16.0",
-            "ssb-uri2": "^1.5.1"
-          }
-        },
-        "ssb-db2": {
-          "version": "2.8.11",
-          "resolved": "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.11.tgz",
-          "integrity": "sha512-XrKVxgWa2kumephDdUMCFY/chdELeUumJyR6S5NVagtVv/aEdHV8cOJXkt5IP3AxNNJB6i/Kk2P4adsdVWGBeg==",
-          "requires": {
-            "async-append-only-log": "^3.1.0",
-            "atomic-file-rw": "^0.2.1",
-            "binary-search-bounds": "^2.0.4",
-            "bipf": "^1.5.4",
-            "clarify-error": "^1.0.0",
-            "debug": "^4.3.1",
-            "fastintcompression": "0.0.4",
-            "flumecodec": "0.0.1",
-            "flumelog-offset": "3.4.4",
-            "hoox": "0.0.1",
-            "jitdb": "^4.0.0",
-            "level": "^6.0.1",
-            "level-codec": "^9.0.2",
-            "lodash.debounce": "^4.0.8",
-            "mkdirp": "^1.0.4",
-            "multicb": "1.2.2",
-            "mutexify": "^1.3.1",
-            "obz": "^1.0.3",
-            "p-defer": "^3.0.0",
-            "promisify-4loc": "1.0.0",
-            "pull-cat": "^1.1.11",
-            "pull-cont": "^0.1.1",
-            "pull-drain-gently": "^1.1.0",
-            "pull-level": "^2.0.4",
-            "pull-paramap": "^1.2.2",
-            "pull-stream": "^3.6.14",
-            "push-stream": "^11.0.0",
-            "rimraf": "^3.0.2",
-            "ssb-bendy-butt": "~0.12.2",
-            "ssb-keys": "^8.1.0",
-            "ssb-ref": "^2.14.3",
-            "ssb-uri2": "^1.5.2",
-            "ssb-validate": "^4.1.3",
-            "ssb-validate2": "~0.1.1",
-            "ssb-validate2-rsjs-node": "^1.0.0",
-            "too-hot": "^1.0.0",
-            "typedarray-to-buffer": "^4.0.0"
-          },
-          "dependencies": {
-            "level-codec": {
-              "version": "9.0.2",
-              "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
-              "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
-              "requires": {
-                "buffer": "^5.6.0"
-              }
-            }
-          }
-        },
-        "ssb-uri2": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.9.0.tgz",
-          "integrity": "sha512-HkgRbZeFe3YhBLfv5C6AgJaz1ESlQ5MP7sAdRTpCYwU4wo0U+d/irvVUsnUimPq6FO/Zn6gmW8BiCk+JBv3rGw==",
-          "requires": {
-            "ssb-typescript": "^2.5.0"
-          }
         }
       }
     },
@@ -12667,6 +12527,18 @@
         "ssb-ref": "^2.16.0",
         "ssb-subset-ql": "^1.0.0",
         "ssb-uri2": "^2.1.0"
+      },
+      "dependencies": {
+        "ssb-subset-ql": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ssb-subset-ql/-/ssb-subset-ql-1.0.1.tgz",
+          "integrity": "sha512-msZA4Oc1rgEEAVLyzMiQNxJf85+XBrw7IEQLHQpMDv+o/p4GGX9Ygijc2RtItnWSu1H5fFcZChL8pf/q+j3q+w==",
+          "requires": {
+            "nano-equal": "^2.0.2",
+            "ssb-db2": ">=3.0.0",
+            "ssb-ref": "^2.13.0"
+          }
+        }
       }
     },
     "ssb-invite": {
@@ -13390,55 +13262,6 @@
         "ssb-sort": "^1.1.3"
       }
     },
-    "ssb-peer-invites": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ssb-peer-invites/-/ssb-peer-invites-2.1.0.tgz",
-      "integrity": "sha512-2TsHdOYZPNvSHQB3NczUaMvtsj+RLFp85h8aNz3UjNkvYRSfaoZ1g2jkAghy26Rp+PvlnwWOPQcFnImVbQEqgw==",
-      "requires": {
-        "chloride": "^2.2.14",
-        "deep-equal": "1.1.0",
-        "flumeview-reduce": "^1.3.17",
-        "is-canonical-base64": "^1.1.1",
-        "pull-paramap": "^1.2.2",
-        "pull-stream": "^3.6.9",
-        "ssb-client": "^4.7.2",
-        "ssb-keys": "^7.1.5",
-        "ssb-ref": "^2.13.9"
-      },
-      "dependencies": {
-        "deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
-          "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
-          "requires": {
-            "is-arguments": "^1.0.4",
-            "is-date-object": "^1.0.1",
-            "is-regex": "^1.0.4",
-            "object-is": "^1.0.1",
-            "object-keys": "^1.1.1",
-            "regexp.prototype.flags": "^1.2.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "requires": {
-            "minimist": "^1.2.6"
-          }
-        },
-        "ssb-keys": {
-          "version": "7.2.2",
-          "resolved": "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.2.tgz",
-          "integrity": "sha512-FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ==",
-          "requires": {
-            "chloride": "^2.2.8",
-            "mkdirp": "~0.5.0",
-            "private-box": "^0.3.0"
-          }
-        }
-      }
-    },
     "ssb-plugins": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/ssb-plugins/-/ssb-plugins-1.0.4.tgz",
@@ -13543,23 +13366,6 @@
         "multiserver-address": "^1.0.1"
       }
     },
-    "ssb-replicate": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/ssb-replicate/-/ssb-replicate-1.3.3.tgz",
-      "integrity": "sha512-RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg==",
-      "requires": {
-        "deep-equal": "^1.0.1",
-        "observ-debounce": "^1.1.1",
-        "obv": "0.0.1",
-        "pull-cat": "^1.1.11",
-        "pull-next": "^1.0.1",
-        "pull-notify": "^0.1.1",
-        "pull-paramap": "^1.2.2",
-        "pull-pushable": "^2.2.0",
-        "pull-stream": "^3.6.9",
-        "ssb-ref": "^2.13.9"
-      }
-    },
     "ssb-replication-scheduler": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/ssb-replication-scheduler/-/ssb-replication-scheduler-2.0.5.tgz",
@@ -13573,6 +13379,47 @@
         "ssb-meta-feeds": "~0.29.0",
         "ssb-network-errors": "^1.0.1",
         "ssb-subset-ql": "~1.0.0"
+      },
+      "dependencies": {
+        "ssb-bendy-butt": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-1.0.2.tgz",
+          "integrity": "sha512-PGIfYKLcpyKAGO6AS3BHctjxL58xK/DN6qmDBYVlxxqT+DI+482XYBCNKGtYfnCUlyBK+qO7lmbJp/DQhR8jmQ==",
+          "requires": {
+            "bencode": "^2.0.1",
+            "ssb-bfe": "^3.3.0",
+            "ssb-keys": "^8.4.0",
+            "ssb-uri2": "^2.0.0"
+          }
+        },
+        "ssb-ebt": {
+          "version": "9.1.2",
+          "resolved": "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-9.1.2.tgz",
+          "integrity": "sha512-nNR26/3da8e+39fARLFDhrNdbkycxvmXqoK7QxrHGJaY/opBGtZ7GaHjNKkaXcF4Fl04ee+NhkYaiq18pGI0RQ==",
+          "requires": {
+            "base64-url": "^2.2.0",
+            "epidemic-broadcast-trees": "^9.0.2",
+            "key-value-file-store": "^1.1.1",
+            "pull-defer": "^0.2.3",
+            "pull-stream": "^3.6.0",
+            "push-stream-to-pull-stream": "^1.0.5",
+            "ssb-bendy-butt": "^1.0.1",
+            "ssb-buttwoo": "^0.3.2",
+            "ssb-classic": "^1.1.0",
+            "ssb-index-feeds": "~0.10.1",
+            "ssb-network-errors": "^1.0.1"
+          }
+        },
+        "ssb-subset-ql": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ssb-subset-ql/-/ssb-subset-ql-1.0.1.tgz",
+          "integrity": "sha512-msZA4Oc1rgEEAVLyzMiQNxJf85+XBrw7IEQLHQpMDv+o/p4GGX9Ygijc2RtItnWSu1H5fFcZChL8pf/q+j3q+w==",
+          "requires": {
+            "nano-equal": "^2.0.2",
+            "ssb-db2": ">=3.0.0",
+            "ssb-ref": "^2.13.0"
+          }
+        }
       }
     },
     "ssb-room": {
@@ -19974,13 +19821,81 @@
       }
     },
     "ssb-subset-ql": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ssb-subset-ql/-/ssb-subset-ql-1.0.1.tgz",
-      "integrity": "sha512-msZA4Oc1rgEEAVLyzMiQNxJf85+XBrw7IEQLHQpMDv+o/p4GGX9Ygijc2RtItnWSu1H5fFcZChL8pf/q+j3q+w==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/ssb-subset-ql/-/ssb-subset-ql-0.6.4.tgz",
+      "integrity": "sha512-uL8vpzmAQzKPKY0TC6r6oyoJpcgbtAx7Eu/RIp+K5ueamTbFXzUgx/6GskwXhOBcL9bqRKjNUAG32w44YGRvEg==",
       "requires": {
         "nano-equal": "^2.0.2",
-        "ssb-db2": ">=3.0.0",
+        "ssb-db2": ">=3.0.0 <=4",
         "ssb-ref": "^2.13.0"
+      },
+      "dependencies": {
+        "flumecodec": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz",
+          "integrity": "sha512-JT0xivzdV7uTucjsLMw6JhK2e1K5TmU4fGmoQqnrJbydgY/V6+m71QoxX5ZtRR1pKoD48uhPDWWE6G5MlNoGkg==",
+          "requires": {
+            "level-codec": "^6.2.0"
+          },
+          "dependencies": {
+            "level-codec": {
+              "version": "6.2.0",
+              "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz",
+              "integrity": "sha512-J437PvCMZZKNT88+VRh6dkmh1ndZzwGwDzb5ZZl3QEsl+U9wIlt8hG+Y1gXVOhH75gf8JyceKGiG6WFUBbxyGQ=="
+            }
+          }
+        },
+        "ssb-db2": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ssb-db2/-/ssb-db2-4.2.1.tgz",
+          "integrity": "sha512-hUz1s2wvSsvE3OvZapJRFqNT1r7uKWfqRWzq90NtniL/xCL/SFkoe6xMNSsJlfEI9E5aLk6EXOz6MnTXIm4IzQ==",
+          "requires": {
+            "async-append-only-log": "^4.3.2",
+            "atomic-file-rw": "^0.3.0",
+            "binary-search-bounds": "^2.0.4",
+            "bipf": "^1.5.4",
+            "clarify-error": "^1.0.0",
+            "debug": "^4.3.1",
+            "fastintcompression": "0.0.4",
+            "flumecodec": "0.0.1",
+            "flumelog-offset": "3.4.4",
+            "hoox": "0.0.1",
+            "jitdb": "^7.0.0",
+            "level": "^6.0.1",
+            "level-codec": "^9.0.2",
+            "lodash.debounce": "^4.0.8",
+            "mkdirp": "^1.0.4",
+            "multicb": "1.2.2",
+            "mutexify": "^1.3.1",
+            "obz": "^1.1.0",
+            "p-defer": "^3.0.0",
+            "pull-cat": "^1.1.11",
+            "pull-drain-gently": "^1.1.0",
+            "pull-level": "^2.0.4",
+            "pull-notify": "^0.1.2",
+            "pull-paramap": "^1.2.2",
+            "pull-stream": "^3.6.14",
+            "push-stream": "^11.0.0",
+            "rimraf": "^3.0.2",
+            "ssb-bendy-butt": "~0.12.2",
+            "ssb-keys": "^8.1.0",
+            "ssb-ref": "^2.14.3",
+            "ssb-uri2": "^1.5.2",
+            "ssb-validate": "^4.1.3",
+            "ssb-validate2": "~0.1.1",
+            "ssb-validate2-rsjs-node": "^1.0.0",
+            "too-hot": "^1.0.0",
+            "typedarray-to-buffer": "^4.0.0"
+          }
+        },
+        "ssb-uri2": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.9.0.tgz",
+          "integrity": "sha512-HkgRbZeFe3YhBLfv5C6AgJaz1ESlQ5MP7sAdRTpCYwU4wo0U+d/irvVUsnUimPq6FO/Zn6gmW8BiCk+JBv3rGw==",
+          "requires": {
+            "ssb-typescript": "^2.5.0"
+          }
+        }
       }
     },
     "ssb-tangle": {

+ 7 - 6
package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krakenslab/oasis",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "SNH-Oasis Project Network GUI",
   "repository": {
     "type": "git",
@@ -42,6 +42,9 @@
     "broadcast-stream": "^0.2.1",
     "has-network": "0.0.1",
     "ip": "^1.1.5",
+    "epidemic-broadcast-trees": "^9.0.4",
+    "packet-stream": "^2.0.6",
+    "packet-stream-codec": "^1.2.0",
     "mdmanifest": "^1.0.8",
     "minimist": "^1.1.3",
     "mkdirp": "^1.0.4",
@@ -73,8 +76,8 @@
     "ssb-config": "^3.4.4",
     "ssb-conn": "^6.0.3",
     "ssb-db": "^20.3.0",
-    "ssb-ebt": "^9.1.2",
-    "ssb-friends": "^4.4.7",
+    "ssb-ebt": "^8.1.2",
+    "ssb-friends": "^5.0.0",
     "ssb-invite": "^3.0.1",
     "ssb-keys": "^8.0.0",
     "ssb-lan": "^1.0.0",
@@ -93,7 +96,6 @@
     "ssb-private1": "^1.0.1",
     "ssb-query": "^2.4.5",
     "ssb-ref": "^2.16.0",
-    "ssb-replicate": "^1.3.0",
     "ssb-tribes": "^3.1.1",
     "ssb-room": "^1.3.0",
     "ssb-search": "^1.3.0",
@@ -115,10 +117,9 @@
     "ssb-conn-query": "^1.2.2",
     "ssb-conn-hub": "^1.2.0",
     "ssb-conn-staging": "^1.0.0",
-    "ssb-peer-invites": "^2.1.0",
     "ssb-device-address": "^1.1.6",
     "scuttle-poll": "^1.5.1",
-    "ssb-replication-scheduler": "^2.0.5",
+    "ssb-replication-scheduler": "^2.0.2",
     "ssb-partial-replication": "^3.0.1",
     "yargs": "^17.0.0"
   },

+ 1 - 1
src/index.js

@@ -430,7 +430,7 @@ router
     return next();
   })
   .get("/", async (ctx) => {
-    ctx.redirect("/public/popular/day");
+    ctx.redirect("/public/latest");
   })
   .get("/robots.txt", (ctx) => {
     ctx.body = "User-agent: *\nDisallow: /";

+ 12 - 5
src/models.js

@@ -661,19 +661,26 @@ module.exports = ({ cooler, isPublic }) => {
     following = null,
     blocking = false,
     me = null,
-  } = {}) => {
+    } = {}) => {
     const ssb = await cooler.open();
     const { id } = ssb;
-    const relationshipObject = await ssb.friends.get({
-      source: id,
+
+    const relationshipObject = await new Promise((resolve, reject) => {
+      ssb.friends.graph((err, graph) => {
+        if (err) {
+          console.error(err);
+          reject(err);
+        }
+        resolve(graph[id] || {});
+      });
     });
 
     const followingList = Object.entries(relationshipObject)
-      .filter(([, val]) => val === true)
+      .filter(([, val]) => val >= 0)
       .map(([key]) => key);
 
     const blockingList = Object.entries(relationshipObject)
-      .filter(([, val]) => val === false)
+      .filter(([, val]) => val === -1)
       .map(([key]) => key);
 
     return pull.filter((message) => {

ファイルの差分が大きいため隠しています
+ 5 - 8
src/server.js


+ 1 - 1
src/ssb/flotilla.js

@@ -6,13 +6,13 @@ const plugins = [
   // Authentication often hooked for authentication.
   require("ssb-master"),
   require("ssb-db"),
-  require("ssb-replicate"),
   require("ssb-backlinks"),
   require("ssb-conn"),
   require("ssb-about"),
   require("ssb-blobs"),
   require("ssb-ebt"),
   require("ssb-friends"),
+  require("ssb-replication-scheduler"),
   require("ssb-invite"),
   require("ssb-lan"),
   require("ssb-logging"),

+ 2 - 2
src/views/index.js

@@ -139,13 +139,13 @@ const template = (titlePrefix, ...elements) => {
       nav(
         ul(
           //navLink({ href: "/imageSearch", emoji: "✧", text: i18n.imageSearch }),
-          navLink({ href: "/public/popular/day", emoji: "⌘", text: i18n.popular }),
           navLink({ href: "/mentions", emoji: "✺", text: i18n.mentions }),
           navLink({ href: "/public/latest", emoji: "☄", text: i18n.latest }),
           navLink({ href: "/public/latest/summaries", emoji: "※", text: i18n.summaries }),
-          navLink({ href: "/public/latest/topics", emoji: "ϟ", text: i18n.topics }),
+          navLink({ href: "/public/latest/topics", emoji: "ϟ", text: i18n.topics }), 
           navLink({ href: "/public/latest/extended", emoji: "∞", text: i18n.extended }),
           navLink({ href: "/public/latest/threads", emoji: "♺", text: i18n.threads }),
+          navLink({ href: "/public/popular/day", emoji: "⌘", text: i18n.popular }),
         )
       ),
       main({ id: "content" }, elements),