Merge pull request #194 from KyleMaas/fix-hops

Fix the Hops setting
arj03 · Feb 8, 2021 · 4771541 · 4771541
2 parents f603320 + 02f243a
commit 4771541
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/defaultprefs.json b/defaultprefs.json
@@ -1,6 +1,6 @@
 {
   "appTitle": "SSB Browser Demo",
-  "replicationHops": 1,
+  "replicationHops": 2,
   "publicFilters": "",
   "favoriteChannels": [],
   "hiddenChannels": [],

diff --git a/messages.json b/messages.json
@@ -161,6 +161,7 @@
       "useSystemDefault": "(Use system default)",
       "colorTheme": "Color theme:",
       "replicateHops": "Number of hops to replicate:",
+      "highHopCountWarning": "WARNING: Hops counts over 2 will very likely slow this app down to the point it is unusable.  Use at your own risk.",
       "directFollows": "(only people you follow)",
       "autorefresh": "Automatically refresh messages when scrolled to the top",
       "advanced": "ADVANCED",
@@ -432,6 +433,7 @@
       "useSystemDefault": "（システムデフォルトを使用）",
       "colorTheme": "カラーテーマ：",
       "replicateHops": "複製するホップ数：",
+      "highHopCountWarning": "警告：ホップ数が2を超えると、このアプリが使用できなくなるまで遅くなる可能性があります。 自己責任。",
       "directFollows": "（あなたがフォローしている人だけ）",
       "autorefresh": "ページが一番上にスクロールされると、メッセージが自動的に更新されます",
       "advanced": "高度な",

diff --git a/ui/browser.js b/ui/browser.js
@@ -1,6 +1,9 @@
 const localPrefs = require('../localprefs')
 const optionsForCore = {
   caps: { shs: Buffer.from(localPrefs.getCaps(), 'base64') },
+  friends: {
+    hops: localPrefs.getHops()
+  },
   hops: localPrefs.getHops(),
   core: {
     startOffline: localPrefs.getOfflineMode()

diff --git a/ui/settings.js b/ui/settings.js
@@ -34,13 +34,13 @@ module.exports = function () {
          <p>
          <label for="replicationHops">{{ $t('settings.replicateHops') }}</label><br />
          <select id="replicationHops" v-model="hops">
-         <option value="0">0 {{ $t('settings.directFollows') }}</option>
-         <option value="1">1</option>
+         <option value="1">1 {{ $t('settings.directFollows') }}</option>
          <option value="2">2</option>
          <option value="3">3</option>
          <option value="4">4</option>
          <option value="5">5</option>
          </select>
+         <span v-if="hops > 2"><br /><strong>{{ $t('settings.highHopCountWarning') }}</strong></span>
          </p>
 
          <p>
@@ -67,7 +67,7 @@ module.exports = function () {
         locale: 'en',
         localeOptions: [],
         autorefresh: false,
-        hops: 1
+        hops: 2
       }
     },