pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alias cleanup and fixes

Browse Source
This commit is contained in:
or-else
2025-05-09 19:19:02 +03:00
parent 360b37ae13
commit 837013e97c
7 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/new-topic-view.jsx
+8 -5
View File
@@ -61,17 +61,20 @@ class NewTopicView extends React.Component {
if (!query) { if (!query) {
query = Tinode.DEL_CHAR; query = Tinode.DEL_CHAR;
} else if (!/[\s,:]/.test(query) && query != Tinode.DEL_CHAR) { } else if (!/[\s,:]/.test(query) && query != Tinode.DEL_CHAR) {
// No colons, spaces or commas, not DEL char. Try as email or phone. // No colons, spaces or commas, not DEL char. Try as email, phone, or alias.
// If not email or phone, treat as alias.
const email = asEmail(query); const email = asEmail(query);
if (email) { if (email) {
query = `email:${email}`; query = `${Tinode.TAG_EMAIL}${email}`;
} else { } else {
const tel = asPhone(query); const tel = asPhone(query);
if (tel) { if (tel) {
query = `tel:${tel}`; query = `${Tinode.TAG_PHONE}${tel}`;
} else { } else {
query = `alias:${query}`; if (query[0] == '@') {
// Strip the leading '@' sign if present.
query = query.substring(1);
}
query = `${Tinode.TAG_ALIAS}${query}`;
} }
} }
} }
src/widgets/tag-manager.jsx
+16 -3
View File
@@ -15,6 +15,7 @@ export default class TagManager extends React.Component {
this.state = { this.state = {
tags: this.props.tags || [], tags: this.props.tags || [],
alias: Tinode.tagByPrefix(this.props.tags, Tinode.TAG_ALIAS) || '',
tagInput: '', tagInput: '',
activated: this.props.activated activated: this.props.activated
}; };
@@ -29,7 +30,10 @@ export default class TagManager extends React.Component {
static getDerivedStateFromProps(nextProps, prevState) { static getDerivedStateFromProps(nextProps, prevState) {
const tags = nextProps.tags || []; const tags = nextProps.tags || [];
if (!arrayEqual(tags, prevState.tags) && !prevState.activated) { if (!arrayEqual(tags, prevState.tags) && !prevState.activated) {
return {tags: tags}; return {
tags: tags || [],
alias: Tinode.tagByPrefix(tags, Tinode.TAG_ALIAS) || '',
};
} }
return null; return null;
} }
@@ -76,8 +80,12 @@ export default class TagManager extends React.Component {
} }
handleSubmit() { handleSubmit() {
// Add unprocessed input to tags, submit the list. // Add unprocessed input to tags.
this.props.onSubmit(this.handleAddTag(this.state.tagInput.trim())); let tags = this.handleAddTag(this.state.tagInput.trim());
// Add back the alias (and overwrite one possibly added by hand).
tags = Tinode.setUniqueTag(tags, this.state.alias);
// Submit the updated list.
this.props.onSubmit(tags);
this.setState({activated: false, tags: this.props.tags || []}); this.setState({activated: false, tags: this.props.tags || []});
} }
@@ -95,11 +103,16 @@ export default class TagManager extends React.Component {
let tags = []; let tags = [];
if (this.state.activated) { if (this.state.activated) {
this.state.tags.forEach(tag => { this.state.tags.forEach(tag => {
if (tag != this.state.alias) {
tags.push({user: tag, invalid: (tag.length < minTagLength || tag.length > maxTagLength)}); tags.push({user: tag, invalid: (tag.length < minTagLength || tag.length > maxTagLength)});
}
}); });
} else { } else {
this.state.tags.forEach(tag => { this.state.tags.forEach(tag => {
if (tag != this.state.alias) {
tags.push(<span className="badge" key={tags.length}>{tag}</span>); tags.push(<span className="badge" key={tags.length}>{tag}</span>);
}
}); });
if (tags.length == 0) { if (tags.length == 0) {
tags = ( tags = (
src/widgets/topic-desc-edit.jsx
+16 -16
View File
@@ -38,7 +38,6 @@ const messages = defineMessages({
} }
}); });
const ALIAS_REGEX = /^[a-z0-9][a-z0-9_\-]{3,23}$/i; // 4-24 characters, starting with letter or digit, then letters, digits, hyphen, underscore.
const ALIAS_AVAILABILITY_CHECK_DELAY = 1000; // milliseconds const ALIAS_AVAILABILITY_CHECK_DELAY = 1000; // milliseconds
class TopicDescEdit extends React.Component { class TopicDescEdit extends React.Component {
@@ -179,11 +178,10 @@ class TopicDescEdit extends React.Component {
} }
handleAliasUpdate(alias) { handleAliasUpdate(alias) {
alias = alias.trim() || ''; alias = (alias || '').trim();
const tags = this.state.tags.filter(t => !t.startsWith('alias:')); const tags = alias ?
if (alias) { Tinode.setUniqueTag(this.state.tags, Tinode.TAG_ALIAS + alias.toLowerCase()) :
tags.push('alias:' + alias.toLowerCase()); Tinode.clearTagPrefix(this.state.tags, Tinode.TAG_ALIAS);
}
this.handleTagsUpdated(tags); this.handleTagsUpdated(tags);
} }
@@ -191,12 +189,13 @@ class TopicDescEdit extends React.Component {
// Reset pending delayed check. // Reset pending delayed check.
this.cancelValidator(); this.cancelValidator();
alias = alias.trim();
if (!alias) { if (!alias) {
this.setState({aliasError: ''}); this.setState({aliasError: ''});
return true; return true;
} }
const valid = ALIAS_REGEX.test(alias); const valid = Tinode.isValidTagValue(alias);
if (!valid) { if (!valid) {
this.setState({aliasError: this.props.intl.formatMessage(messages.alias_invalid)}); this.setState({aliasError: this.props.intl.formatMessage(messages.alias_invalid)});
return false; return false;
@@ -204,6 +203,12 @@ class TopicDescEdit extends React.Component {
this.setState({aliasError: ''}); this.setState({aliasError: ''});
// Setup a delayed check for alias availability. // Setup a delayed check for alias availability.
const fnd = topic._tinode.getOrCreateFndTopic();
if (!fnd) {
// Unable to check alias availability.
this.setState({aliasError: ''});
return true;
}
this.aliasCheckPromise = {}; this.aliasCheckPromise = {};
const validationPromise = new Promise((resolve, reject) => { const validationPromise = new Promise((resolve, reject) => {
this.aliasCheckPromise.resolve = resolve; this.aliasCheckPromise.resolve = resolve;
@@ -211,15 +216,10 @@ class TopicDescEdit extends React.Component {
}); });
this.aliasCheckTimer = setTimeout(_ => { this.aliasCheckTimer = setTimeout(_ => {
this.aliasCheckTimer = null; this.aliasCheckTimer = null;
const fnd = this.props.tinode.getFndTopic(); fnd.checkTagUniqueness(`${Tinode.TAG_ALIAS}${alias}`, this.name())
fnd.subscribe() .then(ok => {
.then(_ => fnd.setMeta({desc: {public: `alias:${alias}`}})) this.aliasCheckPromise.resolve(ok)
.then(_ => fnd.getMeta(fnd.startMetaQuery().withTags().build())) this.setState({aliasError: ok ? '' : this.props.intl.formatMessage(messages.alias_already_taken)});
.then(meta => {
const taken = Array.isArray(meta.tags);
this.setState({aliasError: taken ?
this.props.intl.formatMessage(messages.alias_already_taken) : ''});
this.aliasCheckPromise.resolve(!taken)
}) })
.catch(err => { .catch(err => {
this.aliasCheckPromise.reject(err); this.aliasCheckPromise.reject(err);
umd/index.dev.js
+30 -21
View File
@@ -11739,13 +11739,16 @@ class NewTopicView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
} else if (!/[\s,:]/.test(query) && query != tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.DEL_CHAR) { } else if (!/[\s,:]/.test(query) && query != tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.DEL_CHAR) {
const email = (0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_8__.asEmail)(query); const email = (0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_8__.asEmail)(query);
if (email) { if (email) {
query = `email:${email}`; query = `${tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.TAG_EMAIL}${email}`;
} else { } else {
const tel = (0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_8__.asPhone)(query); const tel = (0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_8__.asPhone)(query);
if (tel) { if (tel) {
query = `tel:${tel}`; query = `${tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.TAG_PHONE}${tel}`;
} else { } else {
query = `alias:${query}`; if (query[0] == '@') {
query = query.substring(1);
}
query = `${tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.TAG_ALIAS}${query}`;
} }
} }
} }
@@ -20870,6 +20873,7 @@ class TagManager extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component
super(props); super(props);
this.state = { this.state = {
tags: this.props.tags || [], tags: this.props.tags || [],
alias: tinode_sdk__WEBPACK_IMPORTED_MODULE_3__.Tinode.tagByPrefix(this.props.tags, tinode_sdk__WEBPACK_IMPORTED_MODULE_3__.Tinode.TAG_ALIAS) || '',
tagInput: '', tagInput: '',
activated: this.props.activated activated: this.props.activated
}; };
@@ -20883,7 +20887,8 @@ class TagManager extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component
const tags = nextProps.tags || []; const tags = nextProps.tags || [];
if (!(0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_5__.arrayEqual)(tags, prevState.tags) && !prevState.activated) { if (!(0,_lib_utils_js__WEBPACK_IMPORTED_MODULE_5__.arrayEqual)(tags, prevState.tags) && !prevState.activated) {
return { return {
tags: tags tags: tags || [],
alias: tinode_sdk__WEBPACK_IMPORTED_MODULE_3__.Tinode.tagByPrefix(tags, tinode_sdk__WEBPACK_IMPORTED_MODULE_3__.Tinode.TAG_ALIAS) || ''
}; };
} }
return null; return null;
@@ -20930,7 +20935,9 @@ class TagManager extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component
} }
} }
handleSubmit() { handleSubmit() {
this.props.onSubmit(this.handleAddTag(this.state.tagInput.trim())); let tags = this.handleAddTag(this.state.tagInput.trim());
tags = tinode_sdk__WEBPACK_IMPORTED_MODULE_3__.Tinode.setUniqueTag(tags, this.state.alias);
this.props.onSubmit(tags);
this.setState({ this.setState({
activated: false, activated: false,
tags: this.props.tags || [] tags: this.props.tags || []
@@ -20952,17 +20959,21 @@ class TagManager extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component
let tags = []; let tags = [];
if (this.state.activated) { if (this.state.activated) {
this.state.tags.forEach(tag => { this.state.tags.forEach(tag => {
if (tag != this.state.alias) {
tags.push({ tags.push({
user: tag, user: tag,
invalid: tag.length < minTagLength || tag.length > maxTagLength invalid: tag.length < minTagLength || tag.length > maxTagLength
}); });
}
}); });
} else { } else {
this.state.tags.forEach(tag => { this.state.tags.forEach(tag => {
if (tag != this.state.alias) {
tags.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", { tags.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
className: "badge", className: "badge",
key: tags.length key: tags.length
}, tag)); }, tag));
}
}); });
if (tags.length == 0) { if (tags.length == 0) {
tags = react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, { tags = react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
@@ -21104,7 +21115,6 @@ const messages = (0,react_intl__WEBPACK_IMPORTED_MODULE_1__.defineMessages)({
}] }]
} }
}); });
const ALIAS_REGEX = /^[a-z0-9][a-z0-9_\-]{3,23}$/i;
const ALIAS_AVAILABILITY_CHECK_DELAY = 1000; const ALIAS_AVAILABILITY_CHECK_DELAY = 1000;
class TopicDescEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) { class TopicDescEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
constructor(props) { constructor(props) {
@@ -21246,22 +21256,20 @@ class TopicDescEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compon
}); });
} }
handleAliasUpdate(alias) { handleAliasUpdate(alias) {
alias = alias.trim() || ''; alias = (alias || '').trim();
const tags = this.state.tags.filter(t => !t.startsWith('alias:')); const tags = alias ? tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.setUniqueTag(this.state.tags, tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.TAG_ALIAS + alias.toLowerCase()) : tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.clearTagPrefix(this.state.tags, tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.TAG_ALIAS);
if (alias) {
tags.push('alias:' + alias.toLowerCase());
}
this.handleTagsUpdated(tags); this.handleTagsUpdated(tags);
} }
validateAlias(alias) { validateAlias(alias) {
this.cancelValidator(); this.cancelValidator();
alias = alias.trim();
if (!alias) { if (!alias) {
this.setState({ this.setState({
aliasError: '' aliasError: ''
}); });
return true; return true;
} }
const valid = ALIAS_REGEX.test(alias); const valid = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.isValidTagValue(alias);
if (!valid) { if (!valid) {
this.setState({ this.setState({
aliasError: this.props.intl.formatMessage(messages.alias_invalid) aliasError: this.props.intl.formatMessage(messages.alias_invalid)
@@ -21271,6 +21279,13 @@ class TopicDescEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compon
this.setState({ this.setState({
aliasError: '' aliasError: ''
}); });
const fnd = topic._tinode.getOrCreateFndTopic();
if (!fnd) {
this.setState({
aliasError: ''
});
return true;
}
this.aliasCheckPromise = {}; this.aliasCheckPromise = {};
const validationPromise = new Promise((resolve, reject) => { const validationPromise = new Promise((resolve, reject) => {
this.aliasCheckPromise.resolve = resolve; this.aliasCheckPromise.resolve = resolve;
@@ -21278,17 +21293,11 @@ class TopicDescEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compon
}); });
this.aliasCheckTimer = setTimeout(_ => { this.aliasCheckTimer = setTimeout(_ => {
this.aliasCheckTimer = null; this.aliasCheckTimer = null;
const fnd = this.props.tinode.getFndTopic(); fnd.checkTagUniqueness(`${tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.TAG_ALIAS}${alias}`, this.name()).then(ok => {
fnd.subscribe().then(_ => fnd.setMeta({ this.aliasCheckPromise.resolve(ok);
desc: {
public: `alias:${alias}`
}
})).then(_ => fnd.getMeta(fnd.startMetaQuery().withTags().build())).then(meta => {
const taken = Array.isArray(meta.tags);
this.setState({ this.setState({
aliasError: taken ? this.props.intl.formatMessage(messages.alias_already_taken) : '' aliasError: ok ? '' : this.props.intl.formatMessage(messages.alias_already_taken)
}); });
this.aliasCheckPromise.resolve(!taken);
}).catch(err => { }).catch(err => {
this.aliasCheckPromise.reject(err); this.aliasCheckPromise.reject(err);
this.setState({ this.setState({
umd/index.dev.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long