Anon/yandere_fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tusooa/1274-nonascii-tags' into 'develop'

Browse Source 
Fix parsing non-ascii tags

Closes #1274

See merge request pleroma/pleroma-fe!1848
This commit is contained in:
HJ 2023-08-22 20:37:29 +00:00
commit cc0a63736a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/nonascii-tags.fix Normal file
View File

@ -0,0 +1 @@
Fix parsing non-ascii tags

7
src/services/matcher/matcher.service.js
View File

@ -14,8 +14,11 @@ export const mentionMatchesUrl = (attention, url) => {
* @param {string} url * @param {string} url
*/ */
export const extractTagFromUrl = (url) => { export const extractTagFromUrl = (url) => {
const regex = /tag[s]*\/(\w+)$/g const decoded = decodeURI(url)
const result = regex.exec(url) // https://git.pleroma.social/pleroma/elixir-libraries/linkify/-/blob/master/lib/linkify/parser.ex
// https://www.pcre.org/original/doc/html/pcrepattern.html
const regex = /tag[s]*\/([\p{L}\p{N}_]*[\p{Alphabetic}_·\u{200c}][\p{L}\p{N}_·\p{M}\u{200c}]*)$/ug
const result = regex.exec(decoded)
if (!result) { if (!result) {
return false return false
} }

6
test/unit/specs/services/matcher/matcher.spec.js
View File

@ -78,5 +78,11 @@ describe('MatcherService', () => {
expect(MatcherService.extractTagFromUrl(url)).to.eql(false) expect(MatcherService.extractTagFromUrl(url)).to.eql(false)
}) })
it('should return tag name from non-ascii tags', () => {
const url = encodeURI('https://website.com/tag/喵喵喵')
expect(MatcherService.extractTagFromUrl(url)).to.eql('喵喵喵')
})
}) })
}) })