amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: swap base_url getting on some endpoints

Browse Source
This commit is contained in:
Mar0xy 2023-09-25 12:37:58 +02:00
parent 4c89e433ad
commit aaa3a34d60
No known key found for this signature in database
GPG Key ID: 56569BBE47D2C828
3 changed files with 9 additions and 10 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, BASE_URL)).data);
const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id)).data);
reply.send(await getInstance(data.data, contact, this.config, await this.metaService.fetch()));
} catch (e: any) {
/* console.error(e); */

3
packages/backend/src/server/api/mastodon/endpoints/account.ts
View File

@ -106,8 +106,7 @@ export class ApiAccountMastodon {
try {
const data = await this.client.getAccountStatuses(
convertId((this.request.params as any).id, IdType.SharkeyId),
convertTimelinesArgsId(argsToBools(limitToInt(this.request.query as any))),
this.BASE_URL,
convertTimelinesArgsId(argsToBools(limitToInt(this.request.query as any)))
);
return data.data.map((status) => convertStatus(status));
} catch (e: any) {

14
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, host?: string): Promise<Response<Entity.Account>> {
public async getAccount(id: 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, host)
data: MisskeyAPI.Converter.userDetail(res.data, this.baseUrl)
})
})
}
@ -301,7 +301,7 @@ export default class Misskey implements MegalodonInterface {
})
.then(res => {
if (res.data.pinnedNotes) {
return { ...res, data: res.data.pinnedNotes.map(n => MisskeyAPI.Converter.note(n, host)) }
return { ...res, data: res.data.pinnedNotes.map(n => MisskeyAPI.Converter.note(n, this.baseUrl)) }
}
return { ...res, data: [] }
})
@ -630,7 +630,7 @@ export default class Misskey implements MegalodonInterface {
}
return this.client.post<Array<MisskeyAPI.Entity.UserDetail>>('/api/users/search', params).then(res => {
return Object.assign(res, {
data: res.data.map(u => MisskeyAPI.Converter.userDetail(u))
data: res.data.map(u => MisskeyAPI.Converter.userDetail(u, this.baseUrl))
})
})
}
@ -1225,14 +1225,14 @@ export default class Misskey implements MegalodonInterface {
}))
}
public async getStatusFavouritedBy(_id: string, host?: string): Promise<Response<Array<Entity.Account>>> {
public async getStatusFavouritedBy(_id: string): Promise<Response<Array<Entity.Account>>> {
return this.client.post<Array<MisskeyAPI.Entity.Reaction>>("/api/notes/reactions", {
noteId: _id,
})
.then(async (res) => ({
...res,
data: (
await Promise.all(res.data.map((n) => this.getAccount(n.user.id, host)))
await Promise.all(res.data.map((n) => this.getAccount(n.user.id)))
).map((p) => p.data),
}));
}
@ -2059,7 +2059,7 @@ export default class Misskey implements MegalodonInterface {
return this.client.post<Array<MisskeyAPI.Entity.UserDetail>>('/api/users/search', params).then(res => ({
...res,
data: {
accounts: res.data.map(u => MisskeyAPI.Converter.userDetail(u)),
accounts: res.data.map(u => MisskeyAPI.Converter.userDetail(u, this.baseUrl)),
statuses: [],
hashtags: []
}