Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream

Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
This commit is contained in:
Claire 2023-10-24 19:05:18 +02:00
commit 787d5ad386
4 changed files with 912 additions and 721 deletions

View File

@ -35,7 +35,7 @@ class Tag < ApplicationRecord
HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)' HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}" HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
HASHTAG_RE = %r{(?:^|[^/)\w])#(#{HASHTAG_NAME_PAT})}i HASHTAG_RE = %r{(?<![=/)[:word]])#(#{HASHTAG_NAME_PAT})}i
HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/ HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/

View File

@ -177,7 +177,7 @@
"@types/react-dom": "^18.2.4", "@types/react-dom": "^18.2.4",
"@types/react-helmet": "^6.1.6", "@types/react-helmet": "^6.1.6",
"@types/react-immutable-proptypes": "^2.1.0", "@types/react-immutable-proptypes": "^2.1.0",
"@types/react-motion": "^0.0.35", "@types/react-motion": "^0.0.36",
"@types/react-overlays": "^3.1.0", "@types/react-overlays": "^3.1.0",
"@types/react-router": "^5.1.20", "@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
@ -199,7 +199,7 @@
"eslint-config-prettier": "^9.0.0", "eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.5.5", "eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-formatjs": "^4.10.1", "eslint-plugin-formatjs": "^4.10.1",
"eslint-plugin-import": "~2.28.0", "eslint-plugin-import": "~2.29.0",
"eslint-plugin-jsdoc": "^46.1.0", "eslint-plugin-jsdoc": "^46.1.0",
"eslint-plugin-jsx-a11y": "~6.7.1", "eslint-plugin-jsx-a11y": "~6.7.1",
"eslint-plugin-prettier": "^5.0.0", "eslint-plugin-prettier": "^5.0.0",

View File

@ -32,44 +32,48 @@ RSpec.describe Tag do
expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil
end end
it 'does not match URLs with hashtag-like anchors after an empty query parameter' do
expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
end
it 'matches #' do it 'matches #' do
expect(subject.match('this is #').to_s).to eq ' #' expect(subject.match('this is #').to_s).to eq '#'
end end
it 'matches digits at the start' do it 'matches digits at the start' do
expect(subject.match('hello #3d').to_s).to eq ' #3d' expect(subject.match('hello #3d').to_s).to eq '#3d'
end end
it 'matches digits in the middle' do it 'matches digits in the middle' do
expect(subject.match('hello #l33ts35k').to_s).to eq ' #l33ts35k' expect(subject.match('hello #l33ts35k').to_s).to eq '#l33ts35k'
end end
it 'matches digits at the end' do it 'matches digits at the end' do
expect(subject.match('hello #world2016').to_s).to eq ' #world2016' expect(subject.match('hello #world2016').to_s).to eq '#world2016'
end end
it 'matches underscores at the beginning' do it 'matches underscores at the beginning' do
expect(subject.match('hello #_test').to_s).to eq ' #_test' expect(subject.match('hello #_test').to_s).to eq '#_test'
end end
it 'matches underscores at the end' do it 'matches underscores at the end' do
expect(subject.match('hello #test_').to_s).to eq ' #test_' expect(subject.match('hello #test_').to_s).to eq '#test_'
end end
it 'matches underscores in the middle' do it 'matches underscores in the middle' do
expect(subject.match('hello #one_two_three').to_s).to eq ' #one_two_three' expect(subject.match('hello #one_two_three').to_s).to eq '#one_two_three'
end end
it 'matches middle dots' do it 'matches middle dots' do
expect(subject.match('hello #one·two·three').to_s).to eq ' #one·two·three' expect(subject.match('hello #one·two·three').to_s).to eq '#one·two·three'
end end
it 'matches ・unicode in ぼっち・ざ・ろっく correctly' do it 'matches ・unicode in ぼっち・ざ・ろっく correctly' do
expect(subject.match('testing #ぼっち・ざ・ろっく').to_s).to eq ' #ぼっち・ざ・ろっく' expect(subject.match('testing #ぼっち・ざ・ろっく').to_s).to eq '#ぼっち・ざ・ろっく'
end end
it 'matches ZWNJ' do it 'matches ZWNJ' do
expect(subject.match('just add #نرم‌افزار and').to_s).to eq ' #نرم‌افزار' expect(subject.match('just add #نرم‌افزار and').to_s).to eq '#نرم‌افزار'
end end
it 'does not match middle dots at the start' do it 'does not match middle dots at the start' do
@ -77,7 +81,7 @@ RSpec.describe Tag do
end end
it 'does not match middle dots at the end' do it 'does not match middle dots at the end' do
expect(subject.match('hello #one·two·three·').to_s).to eq ' #one·two·three' expect(subject.match('hello #one·two·three·').to_s).to eq '#one·two·three'
end end
it 'does not match purely-numeric hashtags' do it 'does not match purely-numeric hashtags' do

1601
yarn.lock

File diff suppressed because it is too large Load Diff