From b266b21b91ae62459a22a418b05647fc292c001b Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Fri, 10 Feb 2023 20:45:29 +0100
Subject: [PATCH] Merge Masto Api changes

Co-authored-by Natty <natty.sh.git@gmail.com>
---
 .../src/server/api/endpoints/i/registry/get-unsecure.ts    | 2 +-
 .../server/api/mastodon/ApiMastodonCompatibleService.ts    | 4 ++--
 packages/backend/src/server/api/mastodon/endpoints/auth.ts | 6 +++++-
 packages/backend/src/server/index.ts                       | 7 +++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts b/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
index 40065c83ec..a8169aa956 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-unsecure.ts
@@ -1,6 +1,6 @@
 import { ApiError } from "../../../error.js";
 import define from "../../../define.js";
-import { RegistryItems } from "../../../../../models/index.js";
+import {RegistryItems} from "@/models/index.js";
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
index 57a86c96d2..cb00f9f38b 100644
--- a/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
+++ b/packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
@@ -5,7 +5,7 @@ import { apiAccountMastodon } from './endpoints/account.js';
 import { apiStatusMastodon } from './endpoints/status.js';
 import { apiFilterMastodon } from './endpoints/filter.js';
 import { apiTimelineMastodon } from './endpoints/timeline.js';
-import { apiNotificationsMastodon } from './endpoints/notifications.js';
+import { apiNotificationMastodon } from './endpoints/notifications.js';
 import { apiSearchMastodon } from './endpoints/search.js';
 import { getInstance } from './endpoints/meta.js';
 
@@ -23,7 +23,7 @@ export function apiMastodonCompatible(router: Router): void {
 	apiStatusMastodon(router)
 	apiFilterMastodon(router)
 	apiTimelineMastodon(router)
-	apiNotificationsMastodon(router)
+	apiNotificationMastodon(router)
 	apiSearchMastodon(router)
 
 	router.get('/v1/custom_emojis', async (ctx) => {
diff --git a/packages/backend/src/server/api/mastodon/endpoints/auth.ts b/packages/backend/src/server/api/mastodon/endpoints/auth.ts
index 5f5756077f..63dbcc3649 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/auth.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/auth.ts
@@ -2,6 +2,7 @@ import megalodon, { MegalodonInterface } from '@cutls/megalodon';
 import Router from "@koa/router";
 import { koaBody } from 'koa-body';
 import { getClient } from '../ApiMastodonCompatibleService.js';
+import bodyParser from "koa-bodyparser";
 
 const readScope = [
 	'read:account',
@@ -42,7 +43,10 @@ const writeScope = [
 
 export function apiAuthMastodon(router: Router): void {
 
-	router.post('/v1/apps', koaBody(), async (ctx) => {
+	router.post('/v1/apps', koaBody({
+		json: false,
+		multipart: true
+	}), async (ctx) => {
 		const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 		const accessTokens = ctx.request.headers.authorization;
 		const client = getClient(BASE_URL, accessTokens);
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index ea4740cbad..14c127e8ba 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -20,7 +20,7 @@ import { createTemp } from "@/misc/create-temp.js";
 import { publishMainStream } from "@/services/stream.js";
 import * as Acct from "@/misc/acct.js";
 import { envOption } from "@/env.js";
-import { koaBody } from 'koa-body';
+import {koaBody} from "koa-body";
 import megalodon, { MegalodonInterface } from '@cutls/megalodon';
 import activityPub from "./activitypub.js";
 import nodeinfo from "./nodeinfo.js";
@@ -141,7 +141,10 @@ router.get("/oauth/authorize", async (ctx) => {
 	ctx.redirect(Buffer.from(client_id?.toString() || '', 'base64').toString());
 });
 
-router.get("/oauth/token", koaBody(), async (ctx) => {
+router.post("/oauth/token", koaBody({
+	json: false,
+	multipart: true
+}), async (ctx) => {
 	const body: any = ctx.request.body;
 	const BASE_URL = `${ctx.request.protocol}://${ctx.request.hostname}`;
 	const generator = (megalodon as any).default;