doc/config: remove usage of M/Y expiration units, set default expiration to 7d

Author: SharzyL

doc/api.md

@@ -124,7 +124,7 @@ Upload your paste. It accept parameters in form-data:
 
 - `c`: mandatory. The **content** of your paste, text of binary. It should be no larger than 10 MB. The `filename` in its `Content-Disposition` will be present when fetching the paste.
 
-- `e`: optional. The **expiration** time of the paste. After this period of time, the paste is permanently deleted. It should be an integer or a float point number suffixed with an optional unit (seconds by default). Supported units: `s` (seconds), `m` (minutes), `h` (hours), `d` (days), `M` (months). For example, `360.24` means 360.25 seconds; `25d` is interpreted as 25 days. The actual expiration might be shorter than specified expiration due to limitations imposed by the administrator. If unspecified, a default expiration time setting is used.
+- `e`: optional. The **expiration** time of the paste. After this period of time, the paste is permanently deleted. It should be an integer or a float point number suffixed with an optional unit (seconds by default). Supported units: `s` (seconds), `m` (minutes), `h` (hours), `d` (days). For example, `360.24` means 360.25 seconds; `25d` is interpreted as 25 days. The actual expiration might be shorter than specified expiration due to limitations imposed by the administrator. If unspecified, a default expiration time setting is used.
 
 - `s`: optional. The **password** which allows you to modify and delete the paste. If not specified, the worker will generate a random string as password.
 

frontend/index.html

@@ -42,7 +42,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 (leave blank for no expiry). <br>Units: s (seconds), m (minutes), h (hours), d (days), M (months), Y (years)</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)</label>
         </div>
         <div id='paste-passwd-panel' class='paste-setting-subitem-panel'>
             <input type='text' spellcheck='false' name='paste-expiration' id='paste-passwd-input' placeholder='Password'>

src/common.ts

@@ -112,7 +112,7 @@ export function parsePath(pathname: string): ParsedPath {
 }
 
 export function parseExpiration(expirationStr: string): number {
-  const EXPIRE_REGEX = /^[\d.]+\s*[smhdwMY]?$/
+  const EXPIRE_REGEX = /^[\d.]+\s*[smhd]?$/
   if (!EXPIRE_REGEX.test(expirationStr)) {
     throw new WorkerError(400, `‘${expirationStr}’ is not a valid expiration specification`)
   }
@@ -122,9 +122,6 @@ export function parseExpiration(expirationStr: string): number {
   if (lastChar === 'm') expirationSeconds *= 60
   else if (lastChar === 'h') expirationSeconds *= 3600
   else if (lastChar === 'd') expirationSeconds *= 3600 * 24
-  else if (lastChar === 'w') expirationSeconds *= 3600 * 24 * 7
-  else if (lastChar === 'M') expirationSeconds *= 3600 * 24 * 30
-  else if (lastChar === 'Y') expirationSeconds *= 3600 * 24 * 365
   return expirationSeconds
 }
 

test/basic.spec.ts

@@ -133,8 +133,7 @@ test("expire", async () => {
   await testExpireParse("100m", 6000)
   await testExpireParse("100h", 360000)
   await testExpireParse("1d", 86400)
-  await testExpireParse("1M", 2592000)
-  await testExpireParse("1Y", 2592000)  // longer expiration will be clipped to 30d
+  await testExpireParse("100d", 2592000)  // longer expiration will be clipped to 30d
   await testExpireParse("100  m", 6000)
   await testExpireParse("", 1209600)
 

worker-configuration.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// Generated by Wrangler by running `wrangler types` (hash: efea6d6ac4797dcaa89982c8d3bad6a2)
+// Generated by Wrangler by running `wrangler types` (hash: 6f4508d8d2a1a6ac44ffda519020bb4d)
 // Runtime types generated with [email protected] 2023-01-28 
 declare namespace Cloudflare {
 	interface Env {
@@ -11,7 +11,7 @@ declare namespace Cloudflare {
 		TOS_MAIL: "[email protected]";
 		CACHE_STATIC_PAGE_AGE: 7200;
 		CACHE_PASTE_AGE: 600;
-		DEFAULT_EXPIRATION: "14d";
+		DEFAULT_EXPIRATION: "7d";
 		MAX_EXPIRATION: "30d";
 		BASIC_AUTH: {};
 	}

wrangler.toml

@@ -46,7 +46,7 @@ CACHE_STATIC_PAGE_AGE = 7200
 CACHE_PASTE_AGE = 600
 
 # Default expiration
-DEFAULT_EXPIRATION = "14d"
+DEFAULT_EXPIRATION = "7d"
 
 # Max expiration
 MAX_EXPIRATION = "30d"