Page MenuHomePhabricator

D8519.diff
No OneTemporary

D8519.diff

diff --git a/keyserver/package.json b/keyserver/package.json
--- a/keyserver/package.json
+++ b/keyserver/package.json
@@ -11,9 +11,9 @@
"babel-build": ". bash/source-nvm.sh && yarn --silent babel src/ --out-dir dist/ --config-file ./babel.config.cjs --verbose --ignore 'src/landing/flow-typed','src/landing/node_modules','src/landing/package.json','src/lib/flow-typed','src/lib/node_modules','src/lib/package.json','src/web/flow-typed','src/web/node_modules','src/web/package.json','src/web/dist','src/web/webpack.config.js','src/web/account-bar.react.js','src/web/app.react.js','src/web/calendar','src/web/chat','src/web/flow','src/web/loading-indicator.react.js','src/web/modals','src/web/root.js','src/web/router-history.js','src/web/script.js','src/web/selectors/chat-selectors.js','src/web/selectors/entry-selectors.js','src/web/splash','src/web/vector-utils.js','src/web/vectors.react.js'",
"rsync": "rsync -rLpmuv --exclude '*/package.json' --exclude '*/node_modules/*' --include '*.json' --include '*.cjs' --include '*.node' --exclude '*.*' src/ dist/",
"prod-build": "yarn babel-build && yarn rsync",
- "prod": "node --trace-warnings --loader=./loader.mjs dist/keyserver",
+ "prod": "KEYSERVER=true node --trace-warnings --loader=./loader.mjs dist/keyserver",
"dev-rsync": "yarn --silent chokidar --initial --silent -s 'src/**/*.json' 'src/**/*.cjs' -c 'yarn rsync > /dev/null 2>&1'",
- "dev": ". bash/source-nvm.sh && yarn concurrently --names=\"BABEL,RSYNC,NODEM\" -c \"bgBlue.bold,bgMagenta.bold,bgGreen.bold\" \"yarn babel-build --source-maps --watch\" \"yarn dev-rsync\" \". bash/source-nvm.sh && NODE_ENV=development nodemon -e js,json,cjs --watch dist --no-warnings=ExperimentalWarning --loader=./loader.mjs dist/keyserver\"",
+ "dev": ". bash/source-nvm.sh && yarn concurrently --names=\"BABEL,RSYNC,NODEM\" -c \"bgBlue.bold,bgMagenta.bold,bgGreen.bold\" \"yarn babel-build --source-maps --watch\" \"yarn dev-rsync\" \". bash/source-nvm.sh && KEYSERVER=true NODE_ENV=development nodemon -e js,json,cjs --watch dist --no-warnings=ExperimentalWarning --loader=./loader.mjs dist/keyserver\"",
"script": ". bash/source-nvm.sh && NODE_ENV=development node --loader=./loader.mjs",
"test": "jest"
},
diff --git a/lib/facts/genesis.js b/lib/facts/genesis.js
--- a/lib/facts/genesis.js
+++ b/lib/facts/genesis.js
@@ -1,5 +1,7 @@
// @flow
+import { convertToNewIDSchema } from '../utils/validation-utils.js';
+
type Genesis = {
+id: string,
+name: string,
@@ -8,7 +10,7 @@
};
const genesis: Genesis = {
- id: '1',
+ id: process.env['KEYSERVER'] || !convertToNewIDSchema ? '1' : '256|1',
name: 'GENESIS',
description:
'This is the first community on Comm. In the future it will be possible to create chats outside of a community, but for now all of these chats get set with GENESIS as their parent. GENESIS is hosted on Ashoat’s keyserver.',

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 12:38 AM (4 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2679069
Default Alt Text
D8519.diff (2 KB)

Event Timeline