Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: re-added captcha checks #3289

Merged
merged 1 commit into from Jun 27, 2023
Merged

Conversation

TKilFree
Copy link
Contributor

creating a new PR as old one was reverted, see #3249 (comment)

@TKilFree TKilFree force-pushed the readd-captcha branch 3 times, most recently from 39f3ce6 to 9bc4ffc Compare June 23, 2023 14:38
@awdsns awdsns mentioned this pull request Jun 23, 2023
4 tasks
@dessalines
Copy link
Member

Thanks. I will get to reviewing this hopefully early next week, sorry about the confusion.

@TKilFree
Copy link
Contributor Author

No worries, enjoy your weekend, hope you get some time to relax!

@TKilFree TKilFree force-pushed the readd-captcha branch 3 times, most recently from 8948663 to 9764366 Compare June 26, 2023 09:37
crates/api/src/local_user/get_captcha.rs Outdated Show resolved Hide resolved
crates/db_schema/src/diesel_ltree.patch Outdated Show resolved Hide resolved
crates/db_schema/src/impls/captcha_answer.rs Outdated Show resolved Hide resolved
migrations/2023-06-21-153242_add_captcha/up.sql Outdated Show resolved Hide resolved
migrations/2023-06-21-153242_add_captcha/up.sql Outdated Show resolved Hide resolved
crates/api/src/local_user/get_captcha.rs Outdated Show resolved Hide resolved
crates/db_schema/src/impls/captcha_answer.rs Outdated Show resolved Hide resolved
crates/db_schema/src/impls/captcha_answer.rs Show resolved Hide resolved
@TKilFree TKilFree force-pushed the readd-captcha branch 4 times, most recently from 24b4954 to 314e942 Compare June 26, 2023 17:46
TKilFree added a commit to TKilFree/lemmy that referenced this pull request Jun 27, 2023
- removed redundant captcha expiry filter
- added id and published fields to CaptchaAnswer
@Nutomic
Copy link
Member

Nutomic commented Jun 27, 2023

To make CI pass you need to replace crates/db_schema/src/diesel_ltree.patch:22 from this:

@@ -67,13 +63,13 @@ diesel::table! {
         when_ -> Timestamp,

to this:

@@ -76,13 +76,13 @@ diesel::table! {
         published -> Timestamp,

There are also some conflicts.

TKilFree added a commit to TKilFree/lemmy that referenced this pull request Jun 27, 2023
- removed redundant captcha expiry filter
- added id and published fields to CaptchaAnswer
- modified diesel_ltree.patch to pass CI
TKilFree added a commit to TKilFree/lemmy that referenced this pull request Jun 27, 2023
- removed redundant captcha expiry filter
- added id and published fields to CaptchaAnswer
- modified diesel_ltree.patch to pass CI
@TKilFree
Copy link
Contributor Author

To make CI pass you need to replace crates/db_schema/src/diesel_ltree.patch:22 from this:

@@ -67,13 +63,13 @@ diesel::table! {
         when_ -> Timestamp,

to this:

@@ -76,13 +76,13 @@ diesel::table! {
         published -> Timestamp,

There are also some conflicts.

thanks, modified the patch file and resolved conflicts, might be worth checking tho because dessalines was indicating here: #3289 (comment) that there shouldn't need to be changes to the patch file in this PR

@Nutomic
Copy link
Member

Nutomic commented Jun 27, 2023

That comment is wrong. The patch file needs to be changed because the new table is inserted right next to one of the lines from the ltree diff, so the context changes and the existing patch fails to apply.

@dessalines dessalines merged commit 2aef6a5 into LemmyNet:main Jun 27, 2023
1 check passed
@sunaurus sunaurus mentioned this pull request Jun 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants