[ENG-9730] Fixed not shared spam_data among user and his nodes/preprints #11453
+1,062
−47
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cslzchen
approved these changes
Dec 11, 2025
Collaborator
cslzchen
left a comment
cslzchen
left a comment
There was a problem hiding this comment.
LGTM ⭐
As someone who is not familiar with how spam works, I had had a hard time understanding your code until I saw your unit tests. 🥇
Comment on lines
+2411
to
+2427
| """ | ||
| This method makes the next checks when akismet and oopsystem are used: | ||
| 1. A resource and its creator become FLAGGED and other public nodes/preprints of this creator become SPAMMED and contain the same spam data | ||
| 2. Private nodes/preprints don't contain spam data | ||
| 3. If akismet confirms spam, all objects from #1 have spam_pro_tip | ||
| 4. If oopspam confirms spam, all objects from #1 have oopspam_data key in spam_data | ||
| 5. who_flagged property in spam_data contains either service name (akismet or oopspam) or 'both' value | ||
| 6. spam_data of objects from #1 contains headers, request user info and spammy content | ||
|
|
||
| Params: | ||
| spam_object - object that is being checked for spam | ||
| akismet_spam_data - spam data returned by akismet | ||
| oops_spam_data - spam data returned by oopsystem | ||
| objects_to_be_spammed - objects to be spammed instead of flagged. Example: | ||
| spam_object = Node | ||
| spam objects is flagged, its creator is flagged and the others user's public nodes/preprints must be spammed | ||
| """ |
Collaborator
There was a problem hiding this comment.
👍 for this docstring (and the comprehensive unit tests you added), which actually helped me understand the your code
cslzchen
merged commit ae5e88f
into
CenterForOpenScience:hotfix/25.18.2
7 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Admin encounters cases when spam data is not set for the objects that have SPAM status
Changes
When user is being checked for spam, it doesn't set spam data of the user to this related resources
Some objects become FLAGGED instead of SPAM when spam is found by akismet and oopspam
Also fixed losing FLAGGED status of user after account deactivation
It happens when:
Ticket
https://openscience.atlassian.net/browse/ENG-9730?atlOrigin=eyJpIjoiYTI3ZWU1MDRhZjc1NDVhOGIyNjljNjYyY2Q3OGZjOGIiLCJwIjoiaiJ9