Hey Dude, #Democracy should work equal for everybody!? That seems to be the only way to have equal #Liberty for everyone.
' + const postWithHastagsQuery = gql ` + query($id: ID) { + Post(id: $id) { + tags { + name + } + } + } + ` + const postWithHastagsVariables = { + id: postId, + } + const createPostMutation = gql ` + mutation($postId: ID, $postTitle: String!, $postContent: String!) { + CreatePost(id: $postId, title: $postTitle, content: $postContent) { + id + title + content + } + } + ` + + describe('authenticated', () => { + let headers + beforeEach(async () => { + headers = await login({ + email: 'test@example.org', + password: '1234', + }) + client = new GraphQLClient(host, { + headers, + }) + }) + + describe('create a Post with Hashtags', () => { + beforeEach(async () => { + await client.request(createPostMutation, { + postId, + postTitle, + postContent, + }) + }) + + it('both Hashtags are created', async () => { + const expected = [{ + name: 'Democracy', + }, + { + name: 'Liberty', + }, + ] + await expect( + client.request(postWithHastagsQuery, postWithHastagsVariables), + ).resolves.toEqual({ + Post: [{ + tags: expect.arrayContaining(expected), + }, ], + }) + }) + + describe('afterwards update the Post by removing a Hashtag, leaving a Hashtag and add a Hashtag', () => { + // The already existing Hashtag has no class at this point. + const updatedPostContent = + 'Hey Dude, #Elections should work equal for everybody!? That seems to be the only way to have equal #Liberty for everyone.
' + const updatePostMutation = gql ` + mutation($postId: ID!, $postTitle: String, $updatedPostContent: String) { + UpdatePost(id: $postId, title: $postTitle, content: $updatedPostContent) { + id + title + content + } + } + ` + + it('only one previous Hashtag and the new Hashtag exists', async () => { + await client.request(updatePostMutation, { + postId, + postTitle, + updatedPostContent, + }) + + const expected = [{ + name: 'Elections', + }, + { + name: 'Liberty', + }, + ] + await expect( + client.request(postWithHastagsQuery, postWithHastagsVariables), + ).resolves.toEqual({ + Post: [{ + tags: expect.arrayContaining(expected), + }, ], + }) + }) + }) + }) + }) +}) \ No newline at end of file diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js index 9c0078e7a..a7c75d2f8 100644 --- a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js +++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js @@ -1,21 +1,22 @@ import cheerio from 'cheerio' const ID_REGEX = /\/search\/hashtag\/([\w\-.!~*'"(),]+)/g -export default function(content) { +export default function (content) { if (!content) return [] const $ = cheerio.load(content) - const urls = $('.hashtag') + // We can not search for class '.hashtag', because the classes are removed at the 'xss' middleware. + // But we have to know, which Hashtags are removed from the content es well, so we search for the 'a' html-tag. + const urls = $('a') .map((_, el) => { return $(el).attr('href') }) .get() const hashtags = [] urls.forEach(url => { - console.log('url: ', url) let match while ((match = ID_REGEX.exec(url)) != null) { hashtags.push(match[1]) } }) return hashtags -} +} \ No newline at end of file diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js new file mode 100644 index 000000000..1b37aaa34 --- /dev/null +++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js @@ -0,0 +1,51 @@ +import extractHashtags from './extractHashtags' + +describe('extractHashtags', () => { + describe('content undefined', () => { + it('returns empty array', () => { + expect(extractHashtags()).toEqual([]) + }) + }) + + describe('searches through links', () => { + it('finds links with and without ".hashtag" class and extracts Hashtag names', () => { + const content = + '' + expect(extractHashtags(content)).toEqual(['Elections', 'Democracy']) + }) + + it('ignores mentions', () => { + const content = + 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' + expect(extractHashtags(content)).toEqual([]) + }) + + describe('handles links', () => { + it('with domains', () => { + const content = + '' + expect(extractHashtags(content)).toEqual(['Elections', 'Democracy']) + }) + + it('special characters', () => { + const content = + 'Something inspirational about #u!*(),2 and #u.~-3.
' + expect(extractHashtags(content)).toEqual(['u!*(),2', 'u.~-3']) + }) + }) + + describe('does not crash if', () => { + it('`href` contains no Hashtag name', () => { + const content = + 'Something inspirational about #Democracy and #liberty.
' + expect(extractHashtags(content)).toEqual([]) + }) + + it('`href` is empty or invalid', () => { + const content = + 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' + expect(extractHashtags(content)).toEqual([]) + }) + }) + }) +}) diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js index 3ada7e6a9..ccc9944b2 100644 --- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js +++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js @@ -1,7 +1,7 @@ import cheerio from 'cheerio' const ID_REGEX = /\/profile\/([\w\-.!~*'"(),]+)/g -export default function(content) { +export default function (content) { if (!content) return [] const $ = cheerio.load(content) const urls = $('.mention') @@ -11,11 +11,10 @@ export default function(content) { .get() const ids = [] urls.forEach(url => { - console.log('url: ', url) let match while ((match = ID_REGEX.exec(url)) != null) { ids.push(match[1]) } }) return ids -} +} \ No newline at end of file diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js index 4983ad72b..fd60f96ab 100644 --- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js +++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js @@ -1,9 +1,9 @@ -import extractIds from './extractMentionedUsers' +import extractMentionedUsers from './extractMentionedUsers' -describe('extractIds', () => { +describe('extractMentionedUsers', () => { describe('content undefined', () => { it('returns empty array', () => { - expect(extractIds()).toEqual([]) + expect(extractMentionedUsers()).toEqual([]) }) }) @@ -11,33 +11,33 @@ describe('extractIds', () => { it('ignores links without .mention class', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual([]) + expect(extractMentionedUsers(content)).toEqual([]) }) describe('given a link with .mention class', () => { it('extracts ids', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual(['u2', 'u3']) + expect(extractMentionedUsers(content)).toEqual(['u2', 'u3']) }) describe('handles links', () => { it('with slug and id', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual(['u2', 'u3']) + expect(extractMentionedUsers(content)).toEqual(['u2', 'u3']) }) it('with domains', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual(['u2', 'u3']) + expect(extractMentionedUsers(content)).toEqual(['u2', 'u3']) }) it('special characters', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual(['u!*(),2', 'u.~-3']) + expect(extractMentionedUsers(content)).toEqual(['u!*(),2', 'u.~-3']) }) }) @@ -45,15 +45,15 @@ describe('extractIds', () => { it('`href` contains no user id', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual([]) + expect(extractMentionedUsers(content)).toEqual([]) }) it('`href` is empty or invalid', () => { const content = 'Something inspirational about @bob-der-baumeister and @jenny-rostock.
' - expect(extractIds(content)).toEqual([]) + expect(extractMentionedUsers(content)).toEqual([]) }) }) }) }) -}) +}) \ No newline at end of file diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue index 4e775caaf..9444a1062 100644 --- a/webapp/components/ContributionForm/index.vue +++ b/webapp/components/ContributionForm/index.vue @@ -28,16 +28,16 @@