Merge branch 'develop' into merge/2024-02-03

packages/megalodon/package.json

@@ -9,9 +9,9 @@
     "doc": "typedoc --out ../docs ./src",
     "test": "cross-env NODE_ENV=test jest -u --maxWorkers=3"
   },
-  "engines": {
-    "node": ">=15.0.0"
-  },
+	"engines": {
+		"node": "^22.0.0"
+	},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/h3poteto/megalodon.git"

packages/megalodon/src/entities/relationship.ts

@@ -8,6 +8,7 @@ namespace Entity {
     muting: boolean
     muting_notifications: boolean
     requested: boolean
+		requested_by?: boolean
     domain_blocking: boolean
     showing_reblogs: boolean
     endorsed: boolean

packages/megalodon/src/index.ts

@@ -27,7 +27,10 @@ export {
   Pleroma,
   Misskey,
   Entity,
-  Converter
+  Converter,
+	generator,
 }
 
+export const megalodon = generator;
+
 export default generator

packages/megalodon/src/mastodon/entities/relationship.ts

@@ -8,6 +8,7 @@ namespace MastodonEntity {
     muting: boolean
     muting_notifications: boolean
     requested: boolean
+		requested_by: boolean
     domain_blocking: boolean
     showing_reblogs: boolean
     endorsed: boolean

packages/megalodon/src/misskey.ts

@@ -604,7 +604,7 @@ export default class Misskey implements MegalodonInterface {
   /**
    * POST /api/users/relation
    *
-   * @param id Array of account ID, for example `['1sdfag', 'ds12aa']`.
+   * @param ids Array of account ID, for example `['1sdfag', 'ds12aa']`.
    */
   public async getRelationships(ids: Array<string>): Promise<Response<Array<Entity.Relationship>>> {
     return Promise.all(ids.map(id => this.getRelationship(id))).then(results => ({
@@ -2232,7 +2232,7 @@ export default class Misskey implements MegalodonInterface {
                 hashtags: [],
               },
             }));
-            
+
             if (result.status !== 200) {
 							result.status = 200;
 							result.statusText = "OK";

packages/megalodon/src/misskey/api_client.ts

@@ -227,13 +227,14 @@ namespace MisskeyAPI {
         blocking: r.isBlocking,
         blocked_by: r.isBlocked,
         muting: r.isMuted,
-        muting_notifications: false,
+        muting_notifications: r.isMuted,
         requested: r.hasPendingFollowRequestFromYou,
-        domain_blocking: false,
-        showing_reblogs: true,
+				requested_by: r.hasPendingFollowRequestToYou,
+        domain_blocking: r.isInstanceMuted ?? false,
+        showing_reblogs: !r.isRenoteMuted,
         endorsed: false,
-        notifying: false,
-        note: null
+        notifying: !r.isMuted,
+        note: r.memo ?? '',
       }
     }
 

packages/megalodon/src/misskey/entities/relation.ts

@@ -8,5 +8,8 @@ namespace MisskeyEntity {
     isBlocking: boolean
     isBlocked: boolean
     isMuted: boolean
+		isRenoteMuted: boolean
+		isInstanceMuted?: boolean
+		memo?: string | null
   }
 }

packages/megalodon/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
     /* Basic Options */
-    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "target": "ES2022",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "lib": ["es2021", "dom"],                           /* Specify library files to be included in the compilation. */
+    "lib": ["ES2022", "dom"],                           /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */