vivganes/snort
1
0
Fork 0
forked from Kieran/snort
Code Pull Requests Activity

Merge pull request 'fix #556' (#560) from vivganes/snort:fix-556 into main

Browse Source
This commit is contained in:
Kieran 2023-05-15 20:35:22 +00:00
commit fccb704f69
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/Const.ts
View File

@ -131,7 +131,7 @@ export const TweetUrlRegex = /https?:\/\/twitter\.com\/(?:#!\/)?(\w+)\/status(?:
* Hashtag regex
*/
// eslint-disable-next-line no-useless-escape
export const HashtagRegex = /(#[^\s!@#$%^&*()=+.\/,\[{\]};:'"?><]+)/;
export const HashtagRegex = /(#[^\s!@#$%^&*()=+.\/,\[{\]};:'"?><]+)/g;
/**
* Tidal share link regex

14
packages/app/src/System/EventBuilder.ts
View File

@ -42,9 +42,14 @@ export class EventBuilder {
*/
processContent() {
if (this.#content) {
this.#content = this.#content
.replace(/@n(pub|profile|event|ote|addr|)1[acdefghjklmnpqrstuvwxyz023456789]+/g, m => this.#replaceMention(m))
.replace(HashtagRegex, m => this.#replaceHashtag(m));
this.#content = this.#content.replace(/@n(pub|profile|event|ote|addr|)1[acdefghjklmnpqrstuvwxyz023456789]+/g, m =>
this.#replaceMention(m)
);
const hashTags = [...this.#content.matchAll(HashtagRegex)];
hashTags.map(hashTag => {
this.#addHashtag(hashTag[0]);
});
}
return this;
}
@ -95,9 +100,8 @@ export class EventBuilder {
}
}
#replaceHashtag(match: string) {
#addHashtag(match: string) {
const tag = match.slice(1);
this.tag(["t", tag.toLowerCase()]);
return match;
}
}