3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-05-02 03:36:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Allow admin to delete any comment (#715)

Browse source
This commit is contained in:
Luke Vella 2023-06-28 15:51:00 +01:00 • committed by GitHub
parent f65934216c
commit d8b4e86a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/web/src/components/discussion/discussion.tsx
View file

@ -18,6 +18,8 @@ import * as React from "react";
import { Controller, useForm } from "react-hook-form"; import { Controller, useForm } from "react-hook-form";
import { Trans } from "@/components/trans"; import { Trans } from "@/components/trans";
import { usePermissions } from "@/contexts/permissions";
import { useRole } from "@/contexts/role";
import { usePostHog } from "@/utils/posthog"; import { usePostHog } from "@/utils/posthog";
import { requiredString } from "../../utils/form-validation"; import { requiredString } from "../../utils/form-validation";
@ -25,7 +27,7 @@ import NameInput from "../name-input";
import TruncatedLinkify from "../poll/truncated-linkify"; import TruncatedLinkify from "../poll/truncated-linkify";
import UserAvatar from "../poll/user-avatar"; import UserAvatar from "../poll/user-avatar";
import { usePoll } from "../poll-context"; import { usePoll } from "../poll-context";
import { isUnclaimed, useUser } from "../user-provider"; import { useUser } from "../user-provider";
interface CommentForm { interface CommentForm {
authorName: string; authorName: string;
@ -34,7 +36,7 @@ interface CommentForm {
const Discussion: React.FunctionComponent = () => { const Discussion: React.FunctionComponent = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const { poll, admin } = usePoll(); const { poll } = usePoll();
const pollId = poll.id; const pollId = poll.id;
@ -80,6 +82,8 @@ const Discussion: React.FunctionComponent = () => {
}); });
const [isWriting, setIsWriting] = React.useState(false); const [isWriting, setIsWriting] = React.useState(false);
const role = useRole();
const { isUser } = usePermissions();
if (!comments) { if (!comments) {
return null; return null;
@ -95,7 +99,7 @@ const Discussion: React.FunctionComponent = () => {
<div className="space-y-4 p-4"> <div className="space-y-4 p-4">
{comments.map((comment) => { {comments.map((comment) => {
const canDelete = const canDelete =
admin || session.ownsObject(comment) || isUnclaimed(comment); role === "admin" || (comment.userId && isUser(comment.userId));
return ( return (
<div className="" key={comment.id}> <div className="" key={comment.id}>

1
apps/web/src/contexts/permissions.ts
View file

@ -19,6 +19,7 @@ export const usePermissions = () => {
const { participants } = useParticipants(); const { participants } = useParticipants();
const isClosed = poll.closed === true || poll.event !== null; const isClosed = poll.closed === true || poll.event !== null;
return { return {
isUser: (userId: string) => userId === user.id || userId === context.userId,
canAddNewParticipant: !isClosed, canAddNewParticipant: !isClosed,
canEditParticipant: (participantId: string) => { canEditParticipant: (participantId: string) => {
if (isClosed) { if (isClosed) {