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

fix: lists not being received properly

Browse source
This commit is contained in:
Mar0xy 2023-10-30 12:53:28 +01:00
parent e24a57402b
commit 46bb5f2dac
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/server/api/mastodon/endpoints/timeline.ts
View file

@ -151,8 +151,7 @@ export class ApiTimelineMastodon {
const BASE_URL = `${_request.protocol}://${_request.hostname}`; const BASE_URL = `${_request.protocol}://${_request.hostname}`;
const accessTokens = _request.headers.authorization; const accessTokens = _request.headers.authorization;
const client = getClient(BASE_URL, accessTokens); const client = getClient(BASE_URL, accessTokens);
const account = await client.verifyAccountCredentials(); const data = await client.getLists();
const data = await client.getLists(account.data.id);
reply.send(data.data.map((list: Entity.List) => convertList(list))); reply.send(data.data.map((list: Entity.List) => convertList(list)));
} catch (e: any) { } catch (e: any) {
console.error(e); console.error(e);

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

@ -1892,12 +1892,18 @@ export default class Misskey implements MegalodonInterface {
/** /**
* POST /api/users/lists/list * POST /api/users/lists/list
*/ */
public async getLists(id: string): Promise<Response<Array<Entity.List>>> { public async getLists(id?: string): Promise<Response<Array<Entity.List>>> {
if (id) {
return this.client return this.client
.post<Array<MisskeyAPI.Entity.List>>('/api/users/lists/list', { userId: id }) .post<Array<MisskeyAPI.Entity.List>>('/api/users/lists/list', { userId: id })
.then(res => ({ ...res, data: res.data.map(l => MisskeyAPI.Converter.list(l)) })) .then(res => ({ ...res, data: res.data.map(l => MisskeyAPI.Converter.list(l)) }))
} }
return this.client
.post<Array<MisskeyAPI.Entity.List>>('/api/users/lists/list', {})
.then(res => ({ ...res, data: res.data.map(l => MisskeyAPI.Converter.list(l)) }))
}
/** /**
* POST /api/users/lists/show * POST /api/users/lists/show
*/ */