after 30 days, replace comment.content and post.body with 'Deleted' #3208
Conversation
vijaykramesh
force-pushed
the
clear_deleted_posts_comments
branch
2 times, most recently
from
e8e2455
to
0c15d10
Compare
src/scheduled_tasks.rs
Outdated
| .filter(post::updated.lt(now - 30.days())) | ||
| .filter(post::body.ne("Deleted")), | ||
| ) | ||
| .set(post::body.eq("Deleted")) |
There was a problem hiding this comment.
Should we not harmonize this with the text used for example in https://github.com/LemmyNet/lemmy/blob/main/crates/db_schema/src/impls/comment.rs#L34 (and fixing the typo)?
There was a problem hiding this comment.
Would also be good to localize it, see how its done for email
There was a problem hiding this comment.
I didn't tackle localization yet (in part because it saves the actual string to the database, so I'm not sure if we should localize based on the author, the instance, or save the token and then localize it on the way back out for display purposes?
but I did tackle making this standard with what is already there in comment & post, namely having it set the text to
let perma_deleted = "*Permanently Deleted*";
| info!("Overwriting deleted posts..."); | ||
| match diesel::update( | ||
| post::table | ||
| .filter(post::deleted.eq(true)) |
There was a problem hiding this comment.
Isn't there also the removed column we could check?
There was a problem hiding this comment.
removed is in case of mod action. I think those should be kept for transparency.
|
You have some conflicts, need to rebase with latest main branch. |
vijaykramesh
force-pushed
the
clear_deleted_posts_comments
branch
6 times, most recently
from
af3f921
to
5e23bd8
Compare
src/scheduled_tasks.rs
Outdated
| /// overwrite posts and comments 30d after deletion | ||
| fn overwrite_deleted_posts_and_comments(conn: &mut PgConnection) { | ||
| // TODO: localize this at display time via lemmy-translations | ||
| let perma_deleted = "*Permanently Deleted*"; |
There was a problem hiding this comment.
You can move this to a constant so it can be reused across the different functions. No need for the todo.
vijaykramesh
force-pushed
the
clear_deleted_posts_comments
branch
2 times, most recently
from
ad08b10
to
a0e4be1
Compare
crates/db_schema/src/impls/post.rs
Outdated
| @@ -111,14 +111,13 @@ impl Post { | |||
| ) -> Result<Vec<Self>, Error> { | |||
| let conn = &mut get_conn(pool).await?; | |||
|
|
|||
| let perma_deleted = "*Permananently Deleted*"; | |||
| let perma_deleted_url = "https://deleted.com"; | |||
There was a problem hiding this comment.
This feels off. If there must be a URL I'd prefer it being something along the lines of the instance's homepage rather than a hardcoded domain controlled by no-idea-who
vijaykramesh
force-pushed
the
clear_deleted_posts_comments
branch
2 times, most recently
from
64098d9
to
76e3d94
Compare
…th 'Permanently Deleted'
vijaykramesh
force-pushed
the
clear_deleted_posts_comments
branch
from
76e3d94
to
4db65c1
Compare
fixes #2977
on server startup, and then with a daily scheduler thread -
check for all posts & comments where deleted = true && updated < 30 days ago && body/content != "Deleted" and sets it to "Deleted"
this way deletes for comments & posts get federated after 30 days by default.