Horde: Try get shared key info Fixes #4787
| @@ -343,8 +343,9 @@ async function showKudos() { | |||
| 343 | return; | 343 | return; |
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | console.log('Horde user data', data); | 346 | console.log('Horde user data', data.user, 'shared key data', data.sharedKey); |
| 347 | toastr.info(`Kudos: ${data.kudos}`, data.username); | 347 | const kudos = data.sharedKey?.kudos || data.user?.kudos || 0; |
| 348 | toastr.info(`Kudos: ${kudos}`, data.user.username); | ||
| 348 | } | 349 | } |
| 349 | 350 | ||
| 350 | function hordeModelTextString(model) { | 351 | function hordeModelTextString(model) { |
| @@ -87,7 +87,7 @@ async function mergeModelsAndMetadata(models, metadata) { | |||
| 87 | return models.map(model => { | 87 | return models.map(model => { |
| 88 | const metadataModel = metadata[model.name]; | 88 | const metadataModel = metadata[model.name]; |
| 89 | if (!metadataModel) { | 89 | if (!metadataModel) { |
| 90 | return { ...model, is_whitelisted: false }; | 90 | return { ...model, is_whitelisted: false }; |
| 91 | } | 91 | } |
| 92 | return { ...model, ...metadataModel, is_whitelisted: true }; | 92 | return { ...model, ...metadataModel, is_whitelisted: true }; |
| 93 | }); | 93 | }); |
| @@ -294,8 +294,15 @@ router.post('/user-info', async (request, response) => { | |||
| 294 | 294 | ||
| 295 | try { | 295 | try { |
| 296 | const ai_horde = await getHordeClient(); | 296 | const ai_horde = await getHordeClient(); |
| 297 | const sharedKey = await (async () => { | ||
| 298 | try { | ||
| 299 | return await ai_horde.getSharedKey(api_key_horde); | ||
| 300 | } catch { | ||
| 301 | return null; | ||
| 302 | } | ||
| 303 | })(); | ||
| 297 | const user = await ai_horde.findUser({ token: api_key_horde }); | 304 | const user = await ai_horde.findUser({ token: api_key_horde }); |
| 298 | return response.send(user); | 305 | return response.send({ user, sharedKey, anonymous: false }); |
| 299 | } catch (error) { | 306 | } catch (error) { |
| 300 | console.error(error); | 307 | console.error(error); |
| 301 | return response.sendStatus(500); | 308 | return response.sendStatus(500); |