Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Report and block users #4056

Merged
merged 30 commits into from
Jan 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8707453
feat: ReportUserModal (#4051)
AmarTrebinjac Jan 9, 2025
bf10e3a
feat: Add block and report to user profile (#4054)
AmarTrebinjac Jan 9, 2025
dc04928
Merge branch 'main' into MI-655-report-and-block-user
AmarTrebinjac Jan 9, 2025
4b3a1e4
Merge branch 'main' into MI-655-report-and-block-user
ilasw Jan 13, 2025
8961302
feat: Block, report, share on profile available for everyone (#4059)
AmarTrebinjac Jan 14, 2025
303ed50
fix: Should not show following when blocked (#4064)
AmarTrebinjac Jan 14, 2025
5188e43
fix: No longer open report modal when reporting user (#4069)
AmarTrebinjac Jan 16, 2025
13bf6b0
Merge branch 'main' into MI-655-report-and-block-user
AmarTrebinjac Jan 16, 2025
6cb0889
feat: add block user option on post context menu (#4053)
ilasw Jan 16, 2025
1ca01ac
Merge branch 'main' into MI-655-report-and-block-user
AmarTrebinjac Jan 16, 2025
83cb918
update hateful key
AmarTrebinjac Jan 16, 2025
f04673f
Update packages/shared/src/components/modals/report/ReportUserModal.tsx
AmarTrebinjac Jan 17, 2025
4975dfa
fix: cache invalidation (#4078)
AmarTrebinjac Jan 17, 2025
667c867
move query invalidation
AmarTrebinjac Jan 17, 2025
6639d50
remove unused hook
AmarTrebinjac Jan 17, 2025
fc15e64
remove follow button on profile when blocked
AmarTrebinjac Jan 17, 2025
f783008
feat: Remove default add btn in advanced settings, add block btn on u…
AmarTrebinjac Jan 17, 2025
5048c40
invalidate specific feed
AmarTrebinjac Jan 17, 2025
3186941
undo feed key
AmarTrebinjac Jan 17, 2025
3133439
use onsettled to close
AmarTrebinjac Jan 17, 2025
034cf24
Merge branch 'main' into MI-655-report-and-block-user
AmarTrebinjac Jan 17, 2025
e9372fa
add author block
AmarTrebinjac Jan 17, 2025
b18fc2f
use username instead of name
AmarTrebinjac Jan 17, 2025
b91a7b9
try invalidate userblocked request key
AmarTrebinjac Jan 17, 2025
21b0e07
use correct username
AmarTrebinjac Jan 17, 2025
aa9ff36
remove unnecessary feed invalidation
AmarTrebinjac Jan 17, 2025
b9e48ed
fix: block button inside link in source list (#4077)
ilasw Jan 17, 2025
78fa6d8
Merge branch 'main' into MI-655-report-and-block-user
AmarTrebinjac Jan 20, 2025
7552d6d
fix: invalidation of blocked users for settings
capJavert Jan 20, 2025
a3e9f3e
Merge branch 'main' into MI-655-report-and-block-user
AmarTrebinjac Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove follow button on profile when blocked
AmarTrebinjac committed Jan 17, 2025
commit fc15e64b2ddc244bcce24c29331ddc6efc53dd6b
16 changes: 9 additions & 7 deletions packages/shared/src/components/profile/Header.tsx
Original file line number Diff line number Diff line change
@@ -119,13 +119,15 @@ export function Header({
target={TargetId.MyProfile}
/>
)}
<FollowButton
entityId={user.id}
type={ContentPreferenceType.User}
status={contentPreference?.status}
entityName={`@${user.username}`}
className="flex-row-reverse"
/>
{!blocked && (
<FollowButton
entityId={user.id}
type={ContentPreferenceType.User}
status={contentPreference?.status}
entityName={`@${user.username}`}
className="flex-row-reverse"
/>
)}
{!isSameUser && (
<CustomFeedOptionsMenu
onAdd={(feedId) =>