natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of codeberg.org:calckey/calckey into develop

This commit is contained in:
ThatOneCalculator 2023-04-12 17:19:17 -07:00
parent 7f9d3f9d54 941b016998
commit 8f7c136f48
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/backend/src/server/api/endpoints/renote-mute/create.ts
View File

@ -19,12 +19,6 @@ export const meta = {
id: "6fef56f3-e765-4957-88e5-c6f65329b8a5", id: "6fef56f3-e765-4957-88e5-c6f65329b8a5",
}, },
muteeIsYourself: {
message: "Mutee is yourself.",
code: "MUTEE_IS_YOURSELF",
id: "a4619cb2-5f23-484b-9301-94c903074e10",
},
alreadyMuting: { alreadyMuting: {
message: "You are already muting that user.", message: "You are already muting that user.",
code: "ALREADY_MUTING", code: "ALREADY_MUTING",
@ -45,11 +39,6 @@ export const paramDef = {
export default define(meta, paramDef, async (ps, user) => { export default define(meta, paramDef, async (ps, user) => {
const muter = user; const muter = user;
// 自分自身
if (user.id === ps.userId) {
throw new ApiError(meta.errors.muteeIsYourself);
}
// Get mutee // Get mutee
const mutee = await getUser(ps.userId).catch((e) => { const mutee = await getUser(ps.userId).catch((e) => {
if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")

11
packages/backend/src/server/api/endpoints/renote-mute/delete.ts
View File

@ -17,12 +17,6 @@ export const meta = {
id: "b851d00b-8ab1-4a56-8b1b-e24187cb48ef", id: "b851d00b-8ab1-4a56-8b1b-e24187cb48ef",
}, },
muteeIsYourself: {
message: "Mutee is yourself.",
code: "MUTEE_IS_YOURSELF",
id: "f428b029-6b39-4d48-a1d2-cc1ae6dd5cf9",
},
notMuting: { notMuting: {
message: "You are not muting that user.", message: "You are not muting that user.",
code: "NOT_MUTING", code: "NOT_MUTING",
@ -43,11 +37,6 @@ export const paramDef = {
export default define(meta, paramDef, async (ps, user) => { export default define(meta, paramDef, async (ps, user) => {
const muter = user; const muter = user;
// Check if the mutee is yourself
if (user.id === ps.userId) {
throw new ApiError(meta.errors.muteeIsYourself);
}
// Get mutee // Get mutee
const mutee = await getUser(ps.userId).catch((e) => { const mutee = await getUser(ps.userId).catch((e) => {
if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff")

8
packages/client/src/scripts/get-user-menu.ts
View File

@ -267,10 +267,6 @@ export function getUserMenu(user, router: Router = mainRouter) {
action: inviteGroup, action: inviteGroup,
} }
: undefined, : undefined,
] as any;
if ($i && meId !== user.id) {
menu = menu.concat([
null, null,
{ {
icon: user.isRenoteMuted icon: user.isRenoteMuted
@ -279,6 +275,10 @@ export function getUserMenu(user, router: Router = mainRouter) {
text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute, text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute,
action: toggleRenoteMute, action: toggleRenoteMute,
}, },
] as any;
if ($i && meId !== user.id) {
menu = menu.concat([
{ {
icon: user.isMuted icon: user.isMuted
? "ph-eye ph-bold ph-lg" ? "ph-eye ph-bold ph-lg"