Fix month calculation to 30 days, and add no expiry and year as expiry options #49
Conversation
This file contains 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
|
Sorry for closing and re-opening the PR (it was a mis-click) |
rutvora
changed the title
|
Seems that you also need to modify the corresponding tests |
Done |
SharzyL
reviewed
Aug 20, 2024
| @@ -127,7 +127,7 @@ test("expire", async () => { | |||
| await testExpireParse("100m", 6000) | |||
| await testExpireParse("100h", 360000) | |||
| await testExpireParse("1d", 86400) | |||
| await testExpireParse("1M", 18144000) | |||
| await testExpireParse("1M", 2592000) | |||
| await testExpireParse("100 m", 6000) | |||
There was a problem hiding this comment.
We also need tests on Y and empty expiration, considering changes in parseExpiration()
SharzyL
reviewed
Aug 20, 2024
frontend/index.html
Outdated
| @@ -43,7 +43,7 @@ <h2>Settings</h2> | |||
| <div id='paste-expiration-panel' class='paste-setting-subitem-panel'> | |||
| <input list='expiration-choices' type='text' min='60' step='1' name='paste-expiration' | |||
| id='paste-expiration-input' placeholder='Expiration (secs)' value='7d'> | |||
| <label class='small-label' for='paste-expiration-input'>Delete your paste after a period of time. <br>Units: s (seconds), m (minutes), h (hours), d (days), M (months)</label> | |||
| <label class='small-label' for='paste-expiration-input'>Delete your paste after a period of time (leave blank for no expiry). <br>Units: s (seconds), m (minutes), h (hours), d (days), M (months), Y (years) <br> Max 68 years</label> | |||
There was a problem hiding this comment.
Max 68 years could be omitted since I don't think the service can live so long and I prefer the label to be as concise as possible.
SharzyL
reviewed
Aug 20, 2024
frontend/index.client.js
Outdated
| @@ -83,7 +83,10 @@ window.addEventListener('DOMContentLoaded', () => { | |||
| const pasteNotEmpty = inputType === 'edit' | |||
| ? pasteEditArea.prop('value').length > 0 | |||
| : file !== null | |||
| const expirationValid = EXPIRE_REGEX.test(expiration) // TODO: verify it | |||
| expirationValid = EXPIRE_REGEX.test(expiration) // TODO: verify it | |||
There was a problem hiding this comment.
Use let, no implicit declaration
Add tests for expiration in years and no expiry
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #47, Resolves #48