graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-26 23:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: contact person in masto instance endpoint

Browse source
This commit is contained in:
Mar0xy 2023-09-25 03:26:05 +02:00
parent 3526880607
commit 1446514442
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
View file

@ -93,7 +93,7 @@ export class MastodonApiServerService {
},
order: { id: 'ASC' },
});
const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id)).data);
const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id, BASE_URL)).data);
reply.send(await getInstance(data.data, contact, this.config, await this.metaService.fetch()));
} catch (e: any) {
/* console.error(e); */

2
packages/megalodon/src/megalodon.ts
View file

@ -156,7 +156,7 @@ export interface MegalodonInterface {
* @param id The account ID.
* @return An account.
*/
getAccount(id: string): Promise<Response<Entity.Account>>
getAccount(id: string, host?: string): Promise<Response<Entity.Account>>
/**
* Statuses posted to the given account.
*

4
packages/megalodon/src/misskey.ts
View file

@ -266,14 +266,14 @@ export default class Misskey implements MegalodonInterface {
/**
* POST /api/users/show
*/
public async getAccount(id: string): Promise<Response<Entity.Account>> {
public async getAccount(id: string, host?: string): Promise<Response<Entity.Account>> {
return this.client
.post<MisskeyAPI.Entity.UserDetail>('/api/users/show', {
userId: id
})
.then(res => {
return Object.assign(res, {
data: MisskeyAPI.Converter.userDetail(res.data)
data: MisskeyAPI.Converter.userDetail(res.data, host)
})
})
}