cherrypick improve mutes and blocks #61

Open

leah wants to merge 5 commits from mute-fix into main

pull from: mute-fix

merge into: woem.men:main

woem.men:main

woem.men:fix/add-missing-translations

woem.men:feature/mark-incoming-cwed-post-media-as-sensitive

woem.men:cherrypick/small-and-center

woem.men:feature/post-languages

woem.men:feature/custom-email-template

woem.men:cherrypick/refresh-polls

woem.men:cherrypick/listenbrainz

woem.men:feature/alt-text-achivements

woem.men:cherrypick/choosable-search-engine

woem.men:feature/indicate-block-mute

woem.men:cherrypick/wildcard-antenna-accts

woem.men:fix/scroll-alt-text

woem.men:feature/alt-text-badge

woem.men:feature/friendly-captcha

woem.men:forkey-rebrand

woem.men:bug/workflows

woem.men:feature/approval

woem.men:feature/meta-mfm

woem.men:feature/note-editing

Conversation 3 Commits 5 Files changed 1 +7 -11

leah commented 2025-02-05 12:26:09 +00:00

Owner

Copy link

Cherrypicked from foundkey

Cherrypicked from [foundkey](https://akkoma.dev/FoundKeyGang/FoundKey/pulls/32)

leah added 1 commit 2025-02-05 12:26:09 +00:00

cherrypick improve mutes and blocks from foundkey b60c86ae6e

leah added 1 commit 2025-02-05 12:26:21 +00:00

Merge branch 'main' into mute-fix 9d6773c55d

leah added 1 commit 2025-02-05 16:25:49 +00:00

fix double space 80d1cc174c

sugar commented 2025-02-07 21:23:50 +00:00

Owner

Copy link

huh,,, that's an interesting fix :3

wondering if mutes should affect mentions, but it seems reasonable to faer that they should

huh,,, that's an interesting fix :3 wondering if mutes should affect mentions, but it seems reasonable to faer that they should

sugar approved these changes 2025-02-07 21:23:56 +00:00

sugar commented 2025-02-07 21:29:34 +00:00

Owner

Copy link

hm, there is a problem with ignoreAuthor that tests catch, this should be supported in some way

this is essentially used for user timeline, if someone intentionally browses through muted user's timeline, then their posts should be viewable despite the mute

fae imagines changing first condition to if (ids.has(note.userId) && !ignoreAuthor) to match original misskey-io code should be fine

hm, there is a problem with `ignoreAuthor` that tests catch, this should be supported in some way this is essentially used for user timeline, if someone intentionally browses through muted user's timeline, then their posts should be viewable despite the mute fae imagines changing first condition to `if (ids.has(note.userId) && !ignoreAuthor)` to match original misskey-io code should be fine

leah commented 2025-02-08 01:03:32 +00:00

Author

Owner

Copy link

Ah whoops I missed the ignoreAuthor thing but yes that should be fixed.

Ah whoops I missed the ignoreAuthor thing but yes that should be fixed.

leah added 1 commit 2025-02-08 12:01:23 +00:00

re-add ignoreAuthor b597eb4c04

leah added 1 commit 2025-02-08 13:15:46 +00:00

fix? fbb7be529c

Some checks failed

Hide all checks

Lint / pnpm_install (pull_request) Successful in 32s

Details

Test (production install and build) / production (22.x) (pull_request) Successful in 1m9s

Details

Test (frontend) / vitest (22.x) (pull_request) Successful in 1m24s

Details

Test (backend) / validate-api-json (22.x) (pull_request) Successful in 1m34s

Details

Lint / lint (backend) (pull_request) Successful in 1m11s

Details

Lint / lint (misskey-js) (pull_request) Successful in 36s

Details

Lint / lint (sw) (pull_request) Successful in 33s

Details

Test (backend) / unit (22.x) (pull_request) Successful in 2m32s

Details

Lint / lint (frontend) (pull_request) Successful in 7m20s

Details

Lint / typecheck (misskey-js) (pull_request) Successful in 32s

Details

Lint / typecheck (backend) (pull_request) Successful in 1m25s

Details

Test (backend) / e2e (22.x) (pull_request) Failing after 6m30s

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 mute-fix:mute-fix

git checkout mute-fix

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 mute-fix

git checkout mute-fix

git rebase main

git checkout main

git merge --ff-only mute-fix

git checkout mute-fix

git rebase main

git checkout main

git merge --no-ff mute-fix

git checkout main

git merge --squash mute-fix

git checkout main

git merge --ff-only mute-fix

git checkout main

git merge mute-fix

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

sugar

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

2 participants

Notifications

Subscribe

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#61

No description provided.