forked from mirror/misskey
update
This commit is contained in:
parent
4fe0891374
commit
4da6ae53e9
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "2024.5.0-beta1-mattyatea5",
|
"version": "2024.5.0-beta1-mattyatea6",
|
||||||
"codename": "nasubi",
|
"codename": "nasubi",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
import {Column} from "typeorm";
|
|
||||||
|
|
||||||
export class Loginbonus1715787239605 {
|
|
||||||
name = 'Loginbonus1715787239605'
|
|
||||||
|
|
||||||
async up(queryRunner) {
|
|
||||||
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "getPoints"`); }
|
|
||||||
|
|
||||||
async down(queryRunner) {
|
|
||||||
await queryRunner.query(`ALTER TABLE "user_profile" ADD "getPoints" integer NOT NULL DEFAULT '0'`); }
|
|
||||||
}
|
|
@ -75,7 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||||||
{{ i18n.ts.isNotifyIsHome }}
|
{{ i18n.ts.isNotifyIsHome }}
|
||||||
</MkSwitch>
|
</MkSwitch>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="imgUrl">
|
<div v-if="imgUrl" style="width: 30%">
|
||||||
<MkInput v-model="text">
|
<MkInput v-model="text">
|
||||||
<template #label>テスト文章</template>
|
<template #label>テスト文章</template>
|
||||||
</MkInput><br/>
|
</MkInput><br/>
|
||||||
|
@ -81,6 +81,18 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function toggleBlockAndMute() {
|
||||||
|
if (user.isBlocking && user.isMuted || !user.isBlocking && !user.isMuted) {
|
||||||
|
toggleMute();
|
||||||
|
toggleBlock();
|
||||||
|
}
|
||||||
|
if (user.isMuted && !user.isBlocking) {
|
||||||
|
toggleMute();
|
||||||
|
} else if (!user.isMuted && user.isBlocking) {
|
||||||
|
toggleBlock();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function toggleWithReplies() {
|
async function toggleWithReplies() {
|
||||||
os.apiWithDialog('following/update', {
|
os.apiWithDialog('following/update', {
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
@ -327,6 +339,10 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
|
|||||||
icon: 'ti ti-ban',
|
icon: 'ti ti-ban',
|
||||||
text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block,
|
text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block,
|
||||||
action: toggleBlock,
|
action: toggleBlock,
|
||||||
|
}, {
|
||||||
|
icon: 'ti ti-user-off',
|
||||||
|
text: user.isBlocking || user.isMuted ? i18n.ts.unblock + '&' + i18n.ts.unmute : i18n.ts.block + '&' + i18n.ts.mute,
|
||||||
|
action: toggleBlockAndMute,
|
||||||
}]);
|
}]);
|
||||||
|
|
||||||
if (user.isFollowed) {
|
if (user.isFollowed) {
|
||||||
|
Loading…
Reference in New Issue
Block a user