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

upd: move patch function and make note user always detail

Browse source
This commit is contained in:
Mar0xy 2023-09-25 21:10:49 +02:00
parent 1e02899de7
commit a847e4d5cc
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
4 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/entities/NoteEntityService.ts
View file

@ -310,7 +310,7 @@ export class NoteEntityService implements OnModuleInit {
createdAt: note.createdAt.toISOString(),
userId: note.userId,
user: this.userEntityService.pack(note.user ?? note.userId, me, {
detail: false,
detail: true,
}),
text: text,
cw: note.cw,

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

@ -242,8 +242,8 @@ export class MastodonApiServerService {
const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
// displayed without being logged in
try {
const account = new ApiAccountMastodon(_request, client, BASE_URL);
reply.send(await account.updateCredentials());
const data = await client.updateCredentials(_request.body!);
reply.send(convertAccount(data.data));
} catch (e: any) {
/* console.error(e); */
reply.code(401).send(e.response.data);

11
packages/backend/src/server/api/mastodon/endpoints/account.ts
View file

@ -58,17 +58,6 @@ export class ApiAccountMastodon {
}
}
public async updateCredentials() {
try {
const data = await this.client.updateCredentials(this.request.body as any);
return convertAccount(data.data);
} catch (e: any) {
/* console.error(e);
console.error(e.response.data); */
return e.response;
}
}
public async lookup() {
try {
const data = await this.client.search((this.request.query as any).acct, { type: 'accounts' });

2
packages/megalodon/src/misskey/entities/note.ts
View file

@ -8,7 +8,7 @@ namespace MisskeyEntity {
id: string
createdAt: string
userId: string
user: User
user: UserDetail
text: string | null
cw: string | null
visibility: 'public' | 'home' | 'followers' | 'specified'