fix links ending with ) in some circumstances

fix ban validation message
This commit is contained in:
HF 2022-08-07 02:24:53 +02:00
parent 7efeb7f463
commit b857ddba48
2 changed files with 4 additions and 4 deletions

View File

@ -16,7 +16,7 @@ async function submitIIDAction(
) { ) {
let time = parseInterval(duration); let time = parseInterval(duration);
if (time === 0 && duration !== '0') { if (time === 0 && duration !== '0') {
callback(t`You must enter an IID`); callback(t`You must enter a duration`);
return; return;
} }
if (!iid) { if (!iid) {

View File

@ -153,7 +153,7 @@ export default class MString {
// set this.iter temporarily to be able to use thischeckIfLink // set this.iter temporarily to be able to use thischeckIfLink
const oldIter = this.iter; const oldIter = this.iter;
this.iter = zEnd; this.iter = zEnd;
z = this.checkIfLink(); z = this.checkIfLink(true);
zEnd = this.iter; zEnd = this.iter;
this.iter = oldIter; this.iter = oldIter;
if (z === null) { if (z === null) {
@ -193,7 +193,7 @@ export default class MString {
* returns the link or false if there is none * returns the link or false if there is none
* moves iter forward to after the link, if there's one * moves iter forward to after the link, if there's one
*/ */
checkIfLink() { checkIfLink(enclosure = false) {
let cIter = this.iter; let cIter = this.iter;
if (!this.txt.startsWith('://', cIter) || cIter < 3) { if (!this.txt.startsWith('://', cIter) || cIter < 3) {
return null; return null;
@ -208,7 +208,7 @@ export default class MString {
cIter += 3; cIter += 3;
for (; cIter < this.txt.length for (; cIter < this.txt.length
&& !MString.isWhiteSpace(this.txt[cIter]) && !MString.isWhiteSpace(this.txt[cIter])
&& this.txt[cIter] !== ')'; cIter += 1 && (!enclosure || this.txt[cIter] !== ')'); cIter += 1
); );
if (cIter < this.iter + 4) { if (cIter < this.iter + 4) {
return null; return null;