lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

better clean check

feature/dockerfile-arm v0.8.7
Evan Feenstra 5 years ago
parent
bac12d3ece
commit
5029ad2ebb
4 changed files with 13 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 6
      api/utils/nodeinfo.ts
  3. 6
      dist/api/utils/nodeinfo.js
  4. 2
      dist/api/utils/nodeinfo.js.map

2
.gitignore
View File

@ -1,5 +1,7 @@
notes.md
dist/public/uploads
dist/config/app.json
dist/config/config.json

6
api/utils/nodeinfo.ts
View File

@ -79,6 +79,10 @@ export {nodeinfo}
async function isClean(){
// has owner but with no auth token
const cleanOwner = await models.Contact.findOne({ where: { isOwner: true, authToken: null }})
if(cleanOwner) return true
const msgs = await models.Message.findAll()
const allContacts = await models.Contact.findAll()
const noMsgs = msgs.length===0
const onlyOneContact = allContacts.length===1
if(cleanOwner && noMsgs && onlyOneContact) return true
return false
}

6
dist/api/utils/nodeinfo.js
View File

@ -85,7 +85,11 @@ function isClean() {
return __awaiter(this, void 0, void 0, function* () {
// has owner but with no auth token
const cleanOwner = yield models_1.models.Contact.findOne({ where: { isOwner: true, authToken: null } });
if (cleanOwner)
const msgs = yield models_1.models.Message.findAll();
const allContacts = yield models_1.models.Contact.findAll();
const noMsgs = msgs.length === 0;
const onlyOneContact = allContacts.length === 1;
if (cleanOwner && noMsgs && onlyOneContact)
return true;
return false;
});

2
dist/api/utils/nodeinfo.js.map
View File

@ -1 +1 @@
{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../api/utils/nodeinfo.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../api/utils/nodeinfo.ts"],"names":[],"mappings":"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"}
Write Preview
Loading…
Cancel
Save