Merge pull request #58 from atsu1125/disableinvalidbutton

Disableinvalidbutton
sakura-tel · Jan 16, 2023 · 66c98c7 · 66c98c7
2 parents 6285f10 + 8448c72
commit 66c98c7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue
@@ -63,7 +63,7 @@
 					<MkEllipsis v-if="loadingAccounts" class="item" />
 					<div class="divider" v-if="accounts.length > 0"></div>
 					<button class="item _button" @click="addAcount" v-text="$ts.addAcount"/>
-					<button class="item _button" @click="createAccount" v-text="$ts.createAccount"/>
+					<button class="item _button" @click="createAccount" v-if="meta && !(meta.disableRegistration && meta.disableInvitation)" v-text="$ts.createAccount"/>
 					<button class="item danger _button" @click="signout" v-text="$ts.logout"/>
 				</template>
 			</div>
@@ -544,7 +544,7 @@ export default defineComponent({
 				&:first-child, &:last-child {
 					position: sticky;
 					background: var(--bg);
-					z-index: 1;					
+					z-index: 1;
 				}
 
 				&:first-child {

diff --git a/src/client/pages/instance/user-dialog.vue b/src/client/pages/instance/user-dialog.vue
@@ -30,7 +30,7 @@
 				<MkSwitch @update:value="toggleVerify" v-model:value="verified">{{ $ts.verify }}</MkSwitch>
 				<MkSwitch @update:value="togglePremium" v-model:value="premium">{{ $ts.premium }}</MkSwitch>
 				<MkSwitch @update:value="toggleSilence" v-model:value="silenced">{{ $ts.silence }}</MkSwitch>
-				<MkSwitch @update:value="toggleSuspend" v-model:value="suspended">{{ $ts.suspend }}</MkSwitch>
+				<MkSwitch @update:value="toggleSuspend" v-model:value="suspended" :disabled="(user.isModerator || user.isAdmin) && !user.isSuspended">{{ $ts.suspend }}</MkSwitch>
 			</div>
 		</div>
 		<div class="_section">
@@ -39,7 +39,7 @@
 				<MkButton full v-if="user.host != null" @click="updateRemoteUser"><Fa :icon="faSync"/> {{ $ts.updateRemoteUser }}</MkButton>
 				<MkButton full @click="resetPassword"><Fa :icon="faKey"/> {{ $ts.resetPassword }}</MkButton>
 				<MkButton full @click="deleteAllFiles" danger><Fa :icon="faTrashAlt"/> {{ $ts.deleteAllFiles }}</MkButton>
-				<MkButton v-if="!user.isModerator && !user.isAdmin" full @click="deleteAccount" danger><Fa :icon="faTrashAlt"/> {{ $ts.deleteAccount }}</MkButton>
+        <MkButton full @click="deleteAccount" danger :disabled="user.isModerator || user.isAdmin"><Fa :icon="faTrashAlt"/> {{ $ts.deleteAccount }}</MkButton>
 			</div>
 		</div>
 		<div class="_section">

diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue
@@ -28,7 +28,7 @@
 					</div>
 				</div>
 				<div class="action">
-					<MkButton @click="signup()" inline primary>{{ $ts.signup }}</MkButton>
+					<MkButton @click="signup()" inline primary v-if="meta && !(meta.disableRegistration && meta.disableInvitation)">{{ $ts.signup }}</MkButton>
 					<MkButton @click="signin()" inline>{{ $ts.login }}</MkButton>
 					<MkButton inline style="margin-left: 12px;" onclick="window.location.href='/explore'">{{ $ts.explore }}</MkButton>
 				</div>

diff --git a/src/client/scripts/get-user-menu.ts b/src/client/scripts/get-user-menu.ts
@@ -204,7 +204,11 @@ export function getUserMenu(user) {
 				icon: faMicrophoneSlash,
 				text: user.isSilenced ? i18n.locale.unsilence : i18n.locale.silence,
 				action: toggleSilence
-			}, {
+			}]);
+		}
+
+		if ($i && ($i.isAdmin || $i.isModerator) && ((!user.isAdmin && !user.isModerator) || ((user.isAdmin || user.isModerator) && user.isSuspended))) {
+			menu = menu.concat([{
 				icon: faSnowflake,
 				text: user.isSuspended ? i18n.locale.unsuspend : i18n.locale.suspend,
 				action: toggleSuspend

diff --git a/src/server/api/endpoints/users/report-abuse.ts b/src/server/api/endpoints/users/report-abuse.ts
@@ -69,10 +69,6 @@ export default define(meta, async (ps, me) => {
 		throw new ApiError(meta.errors.cannotReportYourself);
 	}
 
-	if (user.isAdmin) {
-		throw new ApiError(meta.errors.cannotReportAdmin);
-	}
-
 	const report = await AbuseUserReports.save({
 		id: genId(),
 		createdAt: new Date(),