amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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(), createdAt: note.createdAt.toISOString(),
userId: note.userId, userId: note.userId,
user: this.userEntityService.pack(note.user ?? note.userId, me, { user: this.userEntityService.pack(note.user ?? note.userId, me, {
detail: false, detail: true,
}), }),
text: text, text: text,
cw: note.cw, 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 const client = getClient(BASE_URL, accessTokens); // we are using this here, because in private mode some info isnt
// displayed without being logged in // displayed without being logged in
try { try {
const account = new ApiAccountMastodon(_request, client, BASE_URL); const data = await client.updateCredentials(_request.body!);
reply.send(await account.updateCredentials()); reply.send(convertAccount(data.data));
} catch (e: any) { } catch (e: any) {
/* console.error(e); */ /* console.error(e); */
reply.code(401).send(e.response.data); 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() { public async lookup() {
try { try {
const data = await this.client.search((this.request.query as any).acct, { type: 'accounts' }); 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 id: string
createdAt: string createdAt: string
userId: string userId: string
user: User user: UserDetail
text: string | null text: string | null
cw: string | null cw: string | null
visibility: 'public' | 'home' | 'followers' | 'specified' visibility: 'public' | 'home' | 'followers' | 'specified'