ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

language detect: remove unwanted db fields

Browse Source
This commit is contained in:
Moriz Wahl 2021-01-20 19:06:39 +01:00 committed by Ulf Gebhardt
parent 250d231a74
commit ca74c91fc9
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
3 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/src/middleware/languages/languages.js
View File

@ -11,31 +11,17 @@ const removeHtmlTags = (input) => {
const setPostLanguage = (text) => { const setPostLanguage = (text) => {
const lngDetector = new LanguageDetect() const lngDetector = new LanguageDetect()
lngDetector.setLanguageType('iso2') lngDetector.setLanguageType('iso2')
const result = lngDetector.detect(removeHtmlTags(text), 2) return lngDetector.detect(removeHtmlTags(text), 1)[0][0]
return {
language: result[0][0],
languageScore: result[0][1],
secondaryLanguage: result[1][0],
secondaryLanguageScore: result[1][1],
}
} }
export default { export default {
Mutation: { Mutation: {
CreatePost: async (resolve, root, args, context, info) => { CreatePost: async (resolve, root, args, context, info) => {
const languages = await setPostLanguage(args.content) args.language = await setPostLanguage(args.content)
args = {
...args,
...languages,
}
return resolve(root, args, context, info) return resolve(root, args, context, info)
}, },
UpdatePost: async (resolve, root, args, context, info) => { UpdatePost: async (resolve, root, args, context, info) => {
const languages = await setPostLanguage(args.content) args.language = await setPostLanguage(args.content)
args = {
...args,
...languages,
}
return resolve(root, args, context, info) return resolve(root, args, context, info)
}, },
}, },

43
backend/src/middleware/languages/languages.spec.js
View File

@ -32,9 +32,6 @@ const createPostMutation = gql`
mutation($title: String!, $content: String!, $categoryIds: [ID]) { mutation($title: String!, $content: String!, $categoryIds: [ID]) {
CreatePost(title: $title, content: $content, categoryIds: $categoryIds) { CreatePost(title: $title, content: $content, categoryIds: $categoryIds) {
language language
languageScore
secondaryLanguage
secondaryLanguageScore
} }
} }
` `
@ -61,17 +58,15 @@ describe('languagesMiddleware', () => {
...variables, ...variables,
content: 'Jeder sollte vor seiner eigenen Tür kehren.', content: 'Jeder sollte vor seiner eigenen Tür kehren.',
} }
const response = await mutate({ await expect(
mutate({
mutation: createPostMutation, mutation: createPostMutation,
variables, variables,
}) }),
expect(response).toMatchObject({ ).resolves.toMatchObject({
data: { data: {
CreatePost: { CreatePost: {
language: 'de', language: 'de',
languageScore: 0.5134188034188034,
secondaryLanguage: 'no',
secondaryLanguageScore: 0.3655555555555555,
}, },
}, },
}) })
@ -82,17 +77,15 @@ describe('languagesMiddleware', () => {
...variables, ...variables,
content: 'A journey of a thousand miles begins with a single step.', content: 'A journey of a thousand miles begins with a single step.',
} }
const response = await mutate({ await expect(
mutate({
mutation: createPostMutation, mutation: createPostMutation,
variables, variables,
}) }),
expect(response).toMatchObject({ ).resolves.toMatchObject({
data: { data: {
CreatePost: { CreatePost: {
language: 'en', language: 'en',
languageScore: 0.3430188679245283,
secondaryLanguage: 'da',
secondaryLanguageScore: 0.19968553459119498,
}, },
}, },
}) })
@ -103,17 +96,15 @@ describe('languagesMiddleware', () => {
...variables, ...variables,
content: 'A caballo regalado, no le mires el diente.', content: 'A caballo regalado, no le mires el diente.',
} }
const response = await mutate({ await expect(
mutate({
mutation: createPostMutation, mutation: createPostMutation,
variables, variables,
}) }),
expect(response).toMatchObject({ ).resolves.toMatchObject({
data: { data: {
CreatePost: { CreatePost: {
language: 'es', language: 'es',
languageScore: 0.46589743589743593,
secondaryLanguage: 'pt',
secondaryLanguageScore: 0.3834188034188034,
}, },
}, },
}) })
@ -125,17 +116,15 @@ describe('languagesMiddleware', () => {
content: content:
'<strong>Jeder</strong> <strike>sollte</strike> <strong>vor</strong> <span>seiner</span> eigenen <blockquote>Tür</blockquote> kehren.', '<strong>Jeder</strong> <strike>sollte</strike> <strong>vor</strong> <span>seiner</span> eigenen <blockquote>Tür</blockquote> kehren.',
} }
const response = await mutate({ await expect(
mutate({
mutation: createPostMutation, mutation: createPostMutation,
variables, variables,
}) }),
expect(response).toMatchObject({ ).resolves.toMatchObject({
data: { data: {
CreatePost: { CreatePost: {
language: 'de', language: 'de',
languageScore: 0.5134188034188034,
secondaryLanguage: 'no',
secondaryLanguageScore: 0.3655555555555555,
}, },
}, },
}) })

3
backend/src/schema/types/type/Post.gql
View File

@ -122,9 +122,6 @@ type Post {
createdAt: String createdAt: String
updatedAt: String updatedAt: String
language: String language: String
languageScore: Float
secondaryLanguage: String
secondaryLanguageScore: Float
pinnedAt: String @cypher( pinnedAt: String @cypher(
statement: "MATCH (this)<-[pinned:PINNED]-(:User) WHERE NOT this.deleted = true AND NOT this.disabled = true RETURN pinned.createdAt" statement: "MATCH (this)<-[pinned:PINNED]-(:User) WHERE NOT this.deleted = true AND NOT this.disabled = true RETURN pinned.createdAt"
) )