Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3061259
D9067.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D9067.diff
View Options
diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -105,7 +105,7 @@
import { useSelector } from '../utils/redux-utils.js';
import { firstLine } from '../utils/string-utils.js';
import { trimText } from '../utils/text-utils.js';
-import { idSchemaRegex } from '../utils/validation-utils.js';
+import { pendingThreadIDRegex } from '../utils/validation-utils.js';
const chatNameMaxLength = 191;
const chatNameMinLength = 0;
@@ -277,8 +277,6 @@
return `pending/${pendingThreadTypeString}${pendingThreadKey}`;
}
-const pendingThreadIDRegex = `pending/(type[0-9]+/[0-9]+(\\+[0-9]+)*|sidebar/${idSchemaRegex})`;
-
type PendingThreadIDContents = {
+threadType: ThreadType,
+memberIDs: $ReadOnlyArray<string>,
@@ -1792,7 +1790,6 @@
threadIsPendingSidebar,
getSingleOtherUser,
getPendingThreadID,
- pendingThreadIDRegex,
parsePendingThreadID,
createPendingThread,
createUnresolvedPendingSidebar,
diff --git a/lib/utils/url-utils.js b/lib/utils/url-utils.js
--- a/lib/utils/url-utils.js
+++ b/lib/utils/url-utils.js
@@ -2,8 +2,12 @@
import t, { type TInterface } from 'tcomb';
-import { idSchemaRegex, tID, tShape } from './validation-utils.js';
-import { pendingThreadIDRegex } from '../shared/thread-utils.js';
+import {
+ idSchemaRegex,
+ tID,
+ tShape,
+ pendingThreadIDRegex,
+} from './validation-utils.js';
export type URLInfo = {
+year?: number,
diff --git a/lib/utils/validation-utils.js b/lib/utils/validation-utils.js
--- a/lib/utils/validation-utils.js
+++ b/lib/utils/validation-utils.js
@@ -105,6 +105,8 @@
const idSchemaRegex = '(?:[0-9]+\\|)?[0-9]+';
+const pendingThreadIDRegex = `pending/(type[0-9]+/[0-9]+(\\+[0-9]+)*|sidebar/${idSchemaRegex})`;
+
export {
tBool,
tString,
@@ -129,4 +131,5 @@
assertWithValidator,
ashoatKeyserverID,
idSchemaRegex,
+ pendingThreadIDRegex,
};
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Oct 25, 12:25 PM (22 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2363963
Default Alt Text
D9067.diff (1 KB)
Attached To
Mode
D9067: [lib] Move pendingThreadIDRegex to validation-utils.js
Attached
Detach File
Event Timeline
Log In to Comment