Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream

docs/migrate.md

@@ -83,9 +83,9 @@ NODE_ENV=production pnpm run migrate
 cd packages/backend
 
 LINE_NUM="$(npx typeorm migration:show -d ormconfig.js | grep -n uniformThemecolor1652859567549 | cut -d ':' -f 1)"
-NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | nl)"
+NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | wc -l)"
 
-for i in $(seq 1 $NUM_MIGRAIONS); do
+for i in $(seq 1 $NUM_MIGRATIONS); do
     npx typeorm migration:revert -d ormconfig.js
 done
 

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

@@ -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 })

packages/backend/src/server/api/mastodon/endpoints/account.ts

@@ -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: "",
 			};

packages/megalodon/src/misskey.ts

@@ -1079,21 +1079,9 @@ 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(res => {
-      /*
-      return this.client.post<MisskeyAPI.Entity.GetAll>('/api/i/registry/get-all', {
-        scope: ['client', 'base'],
-      }).then(ga => {
+    return this.client.post<MisskeyAPI.Entity.UserDetailMe>('/api/i').then(async res => {
 			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})
+				data: this.converter.userPreferences(res.data, await this.getDefaultPostPrivacy())
 			})
 		})
   }
@@ -1539,6 +1527,23 @@ export default class Misskey implements MegalodonInterface {
         .then(res => res.data[0] ?? '⭐');
   }
 
+	private async getDefaultPostPrivacy(): Promise<'public' | 'unlisted' | 'private' | 'direct'> {
+		// 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);
+			}).catch(_ => 'public')
+	}
+
   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, '');

packages/megalodon/src/misskey/api_client.ts

@@ -156,7 +156,7 @@ namespace MisskeyAPI {
         id: u.id,
         username: u.username,
         acct: acct,
-        display_name: u.name,
+        display_name: u.name || u.username,
         locked: u.isLocked,
         created_at: u.createdAt,
         followers_count: u.followersCount,
@@ -175,13 +175,13 @@ namespace MisskeyAPI {
       }
     }
 
-    userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, g: MisskeyAPI.Entity.GetAll): MegalodonEntity.Preferences => {
+    userPreferences = (u: MisskeyAPI.Entity.UserDetailMe, v: 'public' | 'unlisted' | 'private' | 'direct'): MegalodonEntity.Preferences => {
       return {
         "reading:expand:media": "default",
         "reading:expand:spoilers": false,
         "posting:default:language": u.lang,
         "posting:default:sensitive": u.alwaysMarkNsfw,
-        "posting:default:visibility": this.visibility(g.defaultNoteVisibility)
+        "posting:default:visibility": v
       }
     }