e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Revert "[mastodon-client] send proper user preferences"

Browse source 
This reverts commit 3fe156f79578d8506cfbb70f3f6f806f50a818b9.
This commit is contained in:
ThatOneCalculator 2023-07-09 20:12:13 -07:00
parent 4f969f63c1
commit dfd9bd5dd1
No known key found for this signature in database
GPG key ID: 8703CACD01000000
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1079,11 +1079,23 @@ export default class Misskey implements MegalodonInterface {
// accounts/preferences
// ======================================
public async getPreferences(): Promise<Response<Entity.Preferences>> {
return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(async res => {
return Object.assign(res, {
data: this.converter.userPreferences(res.data, await this.getDefaultPostPrivacy())
})
})
return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(res => {
/*
return this.client.post<MisskeyAPI.Entity.GetAll>('/api/i/registry/get-all', {
scope: ['client', 'base'],
}).then(ga => {
return Object.assign(res, {
data: this.converter.userPreferences(res.data, ga.data)
})
})
*/
// TODO:
// FIXME: get this from api
return Object.assign(res, {
data: this.converter.userPreferences(res.data, {defaultNoteVisibility: "followers", tutorial: -1})
})
})
}
// ======================================
@ -1527,7 +1539,7 @@ export default class Misskey implements MegalodonInterface {
.then(res => res.data[0] ?? '⭐');
}
private async getDefaultPostPrivacy(): Promise<'public' | 'unlisted' | 'private' | 'direct'> {
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.

4
packages/megalodon/src/misskey/api_client.ts
View file

@ -175,13 +175,13 @@ namespace MisskeyAPI {
}
}
userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, v: 'public' | 'unlisted' | 'private' | 'direct'): MegalodonEntity.Preferences => {
userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, g: MisskeyAPI.Entity.GetAll): MegalodonEntity.Preferences => {
return {
"reading:expand:media": "default",
"reading:expand:spoilers": false,
"posting:default:language": u.lang,
"posting:default:sensitive": u.alwaysMarkNsfw,
"posting:default:visibility": v
"posting:default:visibility": this.visibility(g.defaultNoteVisibility)
}
}