forked from cory/tildefriends
Rejiggled error display.
This commit is contained in:
37
core/core.js
37
core/core.js
@ -540,13 +540,18 @@ async function getProcessBlob(blobId, key, options) {
|
||||
},
|
||||
};
|
||||
process.sendIdentities = async function () {
|
||||
process.app.send(Object.assign({
|
||||
action: 'identities',
|
||||
}, await getIdentityInfo(
|
||||
process?.credentials?.session?.name,
|
||||
options?.packageOwner,
|
||||
options?.packageName
|
||||
)));
|
||||
process.app.send(
|
||||
Object.assign(
|
||||
{
|
||||
action: 'identities',
|
||||
},
|
||||
await getIdentityInfo(
|
||||
process?.credentials?.session?.name,
|
||||
options?.packageOwner,
|
||||
options?.packageName
|
||||
)
|
||||
)
|
||||
);
|
||||
};
|
||||
process.setActiveIdentity = async function (identity) {
|
||||
if (
|
||||
@ -586,7 +591,7 @@ async function getProcessBlob(blobId, key, options) {
|
||||
process.credentials?.session?.name,
|
||||
options.packageOwner,
|
||||
options.packageName
|
||||
)
|
||||
),
|
||||
]
|
||||
);
|
||||
return id;
|
||||
@ -1555,14 +1560,13 @@ async function getActiveIdentity(user, packageOwner, packageName) {
|
||||
}
|
||||
|
||||
async function getIdentityInfo(user, packageOwner, packageName) {
|
||||
let identities = await ssb.getIdentities(
|
||||
user
|
||||
);
|
||||
let identities = await ssb.getIdentities(user);
|
||||
let names = new Object();
|
||||
for (let identity of identities) {
|
||||
names[identity] = identity;
|
||||
}
|
||||
await ssb.sqlAsync(`
|
||||
await ssb.sqlAsync(
|
||||
`
|
||||
SELECT author, name FROM (
|
||||
SELECT
|
||||
messages.author,
|
||||
@ -1577,15 +1581,12 @@ async function getIdentityInfo(user, packageOwner, packageName) {
|
||||
[JSON.stringify(identities)],
|
||||
function (row) {
|
||||
names[row.author] = row.name;
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
return {
|
||||
identities: identities,
|
||||
identity: await getActiveIdentity(
|
||||
user,
|
||||
packageOwner,
|
||||
packageName
|
||||
),
|
||||
identity: await getActiveIdentity(user, packageOwner, packageName),
|
||||
names: names,
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user