소스 검색

Oasis release 0.7.8

psy 1 일 전
부모
커밋
f3aaa0bce1
3개의 변경된 파일9개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/client/assets/styles/style.css
  2. 6 0
      src/server/SSB_server.js
  3. 2 1
      src/views/main_views.js

+ 1 - 1
src/client/assets/styles/style.css

@@ -5613,7 +5613,7 @@ width:100%; max-width:200px; max-height:300px; object-fit:cover; margin:16px 0;
 .profile-layout-single .profile-side{width:560px;max-width:100%;flex:0 0 auto}
 .profile-side{align-items:center;text-align:center}
 .profile-side-header{display:flex;flex-direction:column;align-items:center;gap:6px;width:100%}
-.profile-side .inhabitant-photo-details{width:160px;height:160px;object-fit:cover;border:2px solid #ff9800;background:transparent}
+.profile-side .inhabitant-photo-details{width:160px !important;height:160px !important;max-width:160px !important;object-fit:cover;border:2px solid #ff9800;background:transparent}
 .profile-side-name{font-size:20px;margin:0;color:#FFD700;word-break:break-word}
 .profile-side-mention{font-family:monospace;font-size:12px;color:#FFD700;word-break:keep-all;white-space:nowrap;overflow-x:auto;margin:6px 0 8px 0;line-height:1.5}
 .profile-side-mention a{color:#FFD700;text-decoration:none}

+ 6 - 0
src/server/SSB_server.js

@@ -14,6 +14,7 @@ const { printMetadata } = require('./ssb_metadata');
   const realErr = console.error;
   const SHS_NOISE = /shs\.server:|they dailed a wrong number|client hello invalid|invalid challenge|wrong application cap/i;
   const EBT_NOISE = /stream ended with:\s*\d+\s+but wanted:\s*\d+/i;
+  const EBT_HANDSHAKE_NOISE = /does not support RPC ebt\./i;
   const isEbtReplicateException = (args) =>
     args.length >= 2 &&
     typeof args[0] === 'string' &&
@@ -43,6 +44,11 @@ const { printMetadata } = require('./ssb_metadata');
     if (args.length >= 1 && typeof args[0] === 'string' && /rpc\.ebt\.replicate exception:.*stream ended with/i.test(args[0])) return;
     return realErr.apply(console, args);
   };
+  const realWarn = console.warn;
+  console.warn = function (...args) {
+    if (args.length >= 1 && typeof args[0] === 'string' && EBT_HANDSHAKE_NOISE.test(args[0])) return;
+    return realWarn.apply(console, args);
+  };
 })();
 
 require('ssb-plugins').loadUserPlugins(SecretStack({ caps }), config);

+ 2 - 1
src/views/main_views.js

@@ -2324,7 +2324,8 @@ exports.authorView = async ({
     wallet:   rawPrefs.wallet   === true,
     ecoTax:   rawPrefs.ecoTax   !== false,
     larpSign: rawPrefs.larpSign === true,
-    clearnet: rawPrefs.clearnet === true
+    clearnet: rawPrefs.clearnet === true,
+    gpg:      rawPrefs.gpg      !== false
   };
   const clearnetSubKeys = ['clearnetShops','clearnetJobs','clearnetEvents','clearnetProjects','clearnetPosts','clearnetAudios','clearnetVideos','clearnetImages','clearnetDocuments','clearnetTorrents','clearnetBookmarks'];
   const anySubClearnet = clearnetSubKeys.some(k => rawPrefs[k] === true);