woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

[Frontend] Incoming media that isnt marked as sensitive but is from a cwed post is now sensitve #74

Open
leah wants to merge 3 commits from feature/mark-incoming-cwed-post-media-as-sensitive into main
pull from: feature/mark-incoming-cwed-post-media-as-sensitive
merge into: woem.men:main
Conversation 0 Commits 3 Files changed 12 +32 -5
leah commented 2025-02-22 12:17:04 +00:00
Owner
Copy link

This PR will make it so that the user can choose if they want incoming media to be shown as sensitive media if its on a post with a cw. By default this setting is enabled. Same if you are not logged in.

This PR will make it so that the user can choose if they want incoming media to be shown as sensitive media if its on a post with a cw. By default this setting is enabled. Same if you are not logged in.
leah added 2 commits 2025-02-22 12:17:04 +00:00
remove mistake
Some checks failed
Lint / pnpm_install (pull_request) Successful in 2m9s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 2m22s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 2m52s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 31s
Details
Lint / lint (backend) (pull_request) Successful in 59s
Details
Lint / lint (sw) (pull_request) Successful in 49s
Details
Lint / lint (misskey-js) (pull_request) Successful in 1m32s
Details
Lint / typecheck (backend) (pull_request) Successful in 1m22s
Details
Lint / lint (frontend) (pull_request) Failing after 8m7s
Details
78adbebb18
leah added 1 commit 2025-02-22 12:49:42 +00:00
fix linter issues
All checks were successful
Lint / pnpm_install (pull_request) Successful in 25s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 58s
Details
Lint / lint (misskey-js) (pull_request) Successful in 32s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 1m14s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 33s
Details
Lint / lint (sw) (pull_request) Successful in 1m33s
Details
Lint / lint (backend) (pull_request) Successful in 1m37s
Details
Lint / typecheck (backend) (pull_request) Successful in 1m39s
Details
Lint / lint (frontend) (pull_request) Successful in 7m28s
Details
38fda7790e
All checks were successful
Lint / pnpm_install (pull_request) Successful in 25s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 58s
Details
Lint / lint (misskey-js) (pull_request) Successful in 32s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 1m14s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 33s
Details
Lint / lint (sw) (pull_request) Successful in 1m33s
Details
Lint / lint (backend) (pull_request) Successful in 1m37s
Details
Lint / typecheck (backend) (pull_request) Successful in 1m39s
Details
Lint / lint (frontend) (pull_request) Successful in 7m28s
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/mark-incoming-cwed-post-media-as-sensitive:feature/mark-incoming-cwed-post-media-as-sensitive
git checkout feature/mark-incoming-cwed-post-media-as-sensitive

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff feature/mark-incoming-cwed-post-media-as-sensitive
git checkout feature/mark-incoming-cwed-post-media-as-sensitive
git rebase main
git checkout main
git merge --ff-only feature/mark-incoming-cwed-post-media-as-sensitive
git checkout feature/mark-incoming-cwed-post-media-as-sensitive
git rebase main
git checkout main
git merge --no-ff feature/mark-incoming-cwed-post-media-as-sensitive
git checkout main
git merge --squash feature/mark-incoming-cwed-post-media-as-sensitive
git checkout main
git merge --ff-only feature/mark-incoming-cwed-post-media-as-sensitive
git checkout main
git merge feature/mark-incoming-cwed-post-media-as-sensitive
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
customization

Change something to be more suitable for forkey

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
feature parity

Another fork has this feature, and it should be pulled into this fork.

  
help wanted

Need some help

  
high priority

   
invalid

Something is wrong

  
low priority

   
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
customization
duplicate
enhancement
feature parity
help wanted
high priority
invalid
low priority
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: woem.men/forkey#74
No description provided.
Delete branch "feature/mark-incoming-cwed-post-media-as-sensitive"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?