Gusted c2028930c1 [MODERATION] User blocking ... - Add the ability to block a user via their profile page. - This will unstar their repositories and visa versa. - Blocked users cannot create issues or pull requests on your the doer's repositories (mind that this is not the case for organizations). - Blocked users cannot comment on the doer's opened issues or pull requests. - Blocked users cannot add reactions to doer's comments. - Blocked users cannot cause a notification trough mentioning the doer. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/540 (cherry picked from commit 687d852480) (cherry picked from commit 0c32a4fde5) (cherry picked from commit 1791130e3c) (cherry picked from commit 37858b7e8f) (cherry picked from commit a3e2bfd7e9) (cherry picked from commit 7009b9fe87) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go templates/user/profile.tmpl (cherry picked from commit b2aec34791) (cherry picked from commit e2f1b73752) [MODERATION] organization blocking a user (#802) - Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit 0505a10421) (cherry picked from commit 37b4e6ef9b) (cherry picked from commit c17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to: 6bbccdd177 Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit 523635f83c) (cherry picked from commit 4743eaa6a0) (cherry picked from commit eff5b43d2e) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit 9d359be5ed) (cherry picked from commit b1f3069a22) [MODERATION] add user blocking API - Follow up for: #540, #802 - Add API routes for user blocking from user and organization perspective. - The new routes have integration testing. - The new model functions have unit tests. - Actually quite boring to write and to read this pull request. (cherry picked from commit f3afaf15c7) (cherry picked from commit 6d754db3e5) (cherry picked from commit 2a89ddc0ac) (cherry picked from commit 4a147bff7e) Conflicts: routers/api/v1/api.go templates/swagger/v1_json.tmpl (cherry picked from commit bb8c339185) (cherry picked from commit 5a11569a01) (cherry picked from commit 2373c801ee) [MODERATION] restore redirect on unblock ctx.RedirectToFirst(ctx.FormString("redirect_to"), ctx.ContextUser.HomeLink()) was replaced by ctx.JSONOK() in 128d77a3a Following up fixes for "Fix inconsistent user profile layout across tabs" (#25739) thus changing the behavior (nicely spotted by the tests). This restores it. (cherry picked from commit 597c243707) (cherry picked from commit cfa539e590) [MODERATION] Add test case (squash) - Add an test case, to test an property of the function. (cherry picked from commit 70dadb1916) [MODERATION] Block adding collaborators - Ensure that the doer and blocked user cannot add each other as collaborators to repositories. - The Web UI gets an detailed message of the specific situation, the API gets an generic Forbidden code. - Unit tests has been added. - Integration testing for Web and API has been added. - This commit doesn't introduce removing each other as collaborators on the block action, due to the complexity of database calls that needs to be figured out. That deserves its own commit and test code. (cherry picked from commit 747be949a1) [MODERATION] move locale_en-US.ini strings to avoid conflicts Conflicts: web_src/css/org.css web_src/css/user.css https://codeberg.org/forgejo/forgejo/pulls/1180 (cherry picked from commit e53f955c88) Conflicts: services/issue/comments.go https://codeberg.org/forgejo/forgejo/pulls/1212 (cherry picked from commit b4a454b576) Conflicts: models/forgejo_migrations/migrate.go options/locale/locale_en-US.ini services/pull/pull.go https://codeberg.org/forgejo/forgejo/pulls/1264 [MODERATION] Remove blocked user collaborations with doer - When the doer blocks an user, who is also an collaborator on an repository that the doer owns, remove that collaboration. - Added unit tests. - Refactor the unit test to be more organized. (cherry picked from commit ec87016178) (cherry picked from commit 313e6174d8) [MODERATION] QoL improvements (squash) - Ensure that organisations cannot be blocked. It currently has no effect, as all blocked operations cannot be executed from an organisation standpoint. - Refactored the API route to make use of the `UserAssignmentAPI` middleware. - Make more use of `t.Run` so that the test code is more clear about which block of code belongs to which test case. - Added more integration testing (to ensure the organisations cannot be blocked and some authorization/permission checks). (cherry picked from commit e9d638d075) [MODERATION] s/{{avatar/{{ctx.AvatarUtils.Avatar/ (cherry picked from commit ce8b30be13) (cherry picked from commit f911dc4025) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/1354 (cherry picked from commit c1b37b7fda) (cherry picked from commit 856a2e0903) [MODERATION] Show graceful error on comment creation - When someone is blocked by the repository owner or issue poster and try to comment on that issue, they get shown a graceful error. - Adds integration test. (cherry picked from commit 490646302e) (cherry picked from commit d3d88667cb) (cherry picked from commit 6818de13a9) [MODERATION] Show graceful error on comment creation (squash) typo (cherry picked from commit 1588d4834a) (cherry picked from commit d510ea52d0) (cherry picked from commit 8249e93a14) [MODERATION] Refactor integration testing (squash) - Motivation for this PR is that I'd noticed that a lot of repeated calls are happening between the test functions and that certain tests weren't using helper functions like `GetCSRF`, therefor this refactor of the integration tests to keep it: clean, small and hopefully more maintainable and understandable. - There are now three integration tests: `TestBlockUser`, `TestBlockUserFromOrganization` and `TestBlockActions` (and has been moved in that order in the source code). - `TestBlockUser` is for doing blocking related actions as an user and `TestBlockUserFromOrganization` as an organisation, even though they execute the same kind of tests they do not share any database calls or logic and therefor it currently doesn't make sense to merge them together (hopefully such oppurtinutiy might be presented in the future). - `TestBlockActions` now contain all tests for actions that should be blocked after blocking has happened, most tests now share the same doer and blocked users and a extra fixture has been added to make this possible for the comment test. - Less code, more comments and more re-use between tests. (cherry picked from commit ffb393213d) (cherry picked from commit 85505e0f81) (cherry picked from commit 0f3cf17761) [MODERATION] Fix network error (squash) - Fix network error toast messages on user actions such as follow and unfollow. This happened because the javascript code now expects an JSON to be returned, but this wasn't the case due to cfa539e590127b4953b010fba3dea21c82a1714. - The integration testing has been adjusted to instead test for the returned flash cookie. (cherry picked from commit 112bc25e54) (cherry picked from commit 1194fe4899) (cherry picked from commit 9abb95a844) [MODERATION] Modernize frontend (squash) - Unify blocked users list. - Use the new flex list classes for blocked users list to avoid using the CSS helper classes and thereby be consistent in the design. - Fix the modal by using the new modal class. - Remove the icon in the modal as looks too big in the new design. - Fix avatar not displaying as it was passing the context where the user should've been passed. - Don't use italics for 'Blocked since' text. - Use namelink template to display the user's name and homelink. (cherry picked from commit ec935a16a3) (cherry picked from commit 67f37c8346) Conflicts: models/user/follow.go models/user/user_test.go routers/api/v1/user/follower.go routers/web/shared/user/header.go routers/web/user/profile.go templates/swagger/v1_json.tmpl https://codeberg.org/forgejo/forgejo/pulls/1468 (cherry picked from commit 6a9626839c) Conflicts: tests/integration/api_nodeinfo_test.go https://codeberg.org/forgejo/forgejo/pulls/1508#issuecomment-1242385 (cherry picked from commit 7378b251b4) Conflicts: models/fixtures/watch.yml models/issues/reaction.go models/issues/reaction_test.go routers/api/v1/repo/issue_reaction.go routers/web/repo/issue.go services/issue/issue.go https://codeberg.org/forgejo/forgejo/pulls/1547		2023-10-02 17:59:57 +02:00
..
actions	[CI] Search .forgejo/workflows first	2023-10-02 16:13:40 +02:00
activitypub	make writing main test easier (#27270)	2023-09-28 01:38:53 +00:00
analyze
assetfs
auth	[SECURITY] default to pbkdf2 with 320,000 iterations	2023-10-02 17:06:22 +02:00
avatar
base
cache
charset
container
context	Improvements of releases list and tags list (#25859)	2023-09-28 13:21:47 +00:00
contexttest
csv
doctor	doctor: delete action entries without existing user (#27292)	2023-09-28 03:03:08 +00:00
emoji
eventsource	More db.DefaultContext refactor (#27265)	2023-09-29 12:12:54 +00:00
generate
git	Support .git-blame-ignore-revs file (#26395)	2023-09-16 17:42:34 +00:00
gitgraph	More db.DefaultContext refactor (#27265)	2023-09-29 12:12:54 +00:00
graceful
hcaptcha
highlight
hostmatcher
html
httpcache
httplib
indexer	[CI] disable meilisearch/elasticsearch test, no server yet in CI	2023-10-02 16:13:40 +02:00
issue/template
json
label
lfs	Refactor lfs requests (#26783)	2023-09-18 08:40:50 +00:00
log
markup	fix media description render for orgmode (#26895)	2023-09-13 05:44:59 +00:00
mcaptcha
metrics	Reduce usage of db.DefaultContext (#27073)	2023-09-14 17:09:32 +00:00
migration
nosql
options
packages
paginator
pprof
private	[CLI] implement forgejo-cli	2023-10-02 16:13:39 +02:00
process
proxy
proxyprotocol
public
queue	[CI] disable redis test, no redis server yet in CI	2023-10-02 16:13:40 +02:00
recaptcha
references	Replace 'userxx' with 'orgxx' in all test files when the user type is org (#27052)	2023-09-14 02:59:53 +00:00
regexplru
repository	[MODERATION] User blocking	2023-10-02 17:59:57 +02:00
secret
session	Next round of db.DefaultContext refactor (#27089)	2023-09-16 14:39:12 +00:00
setting	[GITEA] add GetFile to config provider	2023-10-02 17:06:23 +02:00
sitemap
ssh
storage	[CI] Forgejo Actions based CI for PR & branches	2023-10-02 16:13:40 +02:00
structs	[MODERATION] User blocking	2023-10-02 17:59:57 +02:00
svg
sync
system	make writing main test easier (#27270)	2023-09-28 01:38:53 +00:00
templates	More db.DefaultContext refactor (#27265)	2023-09-29 12:12:54 +00:00
test
testlogger
timeutil
translation
turnstile
typesniffer
updatechecker
upload
uri
user
util	Refactor lfs requests (#26783)	2023-09-18 08:40:50 +00:00
validation
web	Remove some dead code (#27196)	2023-09-22 23:30:31 +08:00
webhook