Merge remote-tracking branch 'misskey-mattyatea/report' into develop
# Conflicts: # locales/index.d.ts # locales/ja-JP.yml # packages/backend/src/models/Meta.ts # packages/backend/src/server/api/endpoints/admin/meta.ts # packages/backend/src/server/api/endpoints/admin/update-meta.ts
This commit is contained in:
commit
7a3eb26c4d
16 changed files with 276 additions and 71 deletions
|
|
@ -103,7 +103,7 @@ export function getAbuseNoteMenu(note: Misskey.entities.Note, text: string): Men
|
|||
const u = note.url ?? note.uri ?? `${url}/notes/${note.id}`;
|
||||
os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
|
||||
user: note.user,
|
||||
initialComment: `Note: ${u}\n-----\n`,
|
||||
initialNoteId: note.id,
|
||||
}, {}, 'closed');
|
||||
},
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue