161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-25 13:39:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "[mastodon-client] send actual default post privacy instead of fallback value""

Browse source 
This reverts commit a441cc6067c487c563bf673be261a179d96e0533.
This commit is contained in:
Laura Hausmann 2023-07-10 18:50:07 +02:00
parent 85fcb8b348
commit b0cf9c6faa
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
View file

@ -33,7 +33,7 @@ export const paramDef = {
} as const;
export default define(meta, paramDef, async (ps, user) => {
if (ps.key !== "reactions") return;
if (ps.key !== "reactions" && ps.key !== "defaultNoteVisibility") return;
const query = RegistryItems.createQueryBuilder("item")
.where("item.domain IS NULL")
.andWhere("item.userId = :userId", { userId: user.id })

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

@ -48,7 +48,7 @@ export function apiAccountMastodon(router: Router): void {
acct.source = {
note: acct.note,
fields: acct.fields,
privacy: "public",
privacy: await client.getDefaultPostPrivacy(),
sensitive: false,
language: "",
};

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

@ -1539,6 +1539,23 @@ export default class Misskey implements MegalodonInterface {
.then(res => res.data[0] ?? '⭐');
}
private async getDefaultPostPrivacy(): Promise<string> {
// NOTE: get-unsecure is calckey's extension.
// Misskey doesn't have this endpoint and regular `/i/registry/get` won't work
// unless you have a 'nativeToken', which is reserved for the frontend webapp.
return this.client
.post<string>('/api/i/registry/get-unsecure', {
key: 'defaultNoteVisibility',
scope: ['client', 'base'],
})
.then(res => {
if (!res.data || (res.data != 'public' && res.data != 'home' && res.data != 'followers' && res.data != 'specified'))
return 'public';
return this.converter.visibility(res.data);
});
}
public async unfavouriteStatus(id: string): Promise<Response<Entity.Status>> {
// NOTE: Misskey allows only one reaction per status, so we don't need to care what that emoji was.
return this.deleteEmojiReaction(id, '');