Merge branch 'master' into 6661-fix-backup-script-for-neo4j-v4

This commit is contained in:
Hannes Heine 2023-09-12 10:40:25 +02:00 committed by GitHub
commit a257e99520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 5 deletions

View File

@ -127,6 +127,7 @@ jobs:
if: ${{ needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true' }}
needs: [files-changed, unit_test_backend]
runs-on: ubuntu-latest
permissions: write-all
continue-on-error: true
steps:
- name: Delete cache

View File

@ -101,6 +101,7 @@ jobs:
name: Cleanup
needs: [docker_preparation, fullstack_tests]
runs-on: ubuntu-latest
permissions: write-all
continue-on-error: true
steps:
- name: Delete cache

View File

@ -103,6 +103,7 @@ jobs:
if: ${{ needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true' }}
needs: [files-changed, unit_test_webapp]
runs-on: ubuntu-latest
permissions: write-all
continue-on-error: true
steps:
- name: Delete cache

View File

@ -131,4 +131,25 @@ describe('languagesMiddleware', () => {
},
})
})
describe('detects no language', () => {
it('has default language', async () => {
variables = {
...variables,
content: '',
}
await expect(
mutate({
mutation: createPostMutation,
variables,
}),
).resolves.toMatchObject({
data: {
CreatePost: {
language: 'en',
},
},
})
})
})
})

View File

@ -1,20 +1,24 @@
import LanguageDetect from 'languagedetect'
import { removeHtmlTags } from '../helpers/cleanHtml'
const setPostLanguage = (text) => {
const setPostLanguage = (text, defaultLanguage) => {
const lngDetector = new LanguageDetect()
lngDetector.setLanguageType('iso2')
return lngDetector.detect(removeHtmlTags(text), 1)[0][0]
let languages = lngDetector.detect(removeHtmlTags(text), 1)
if (!(Array.isArray(languages) && languages.length > 0)) {
languages = [[defaultLanguage, 1.0]]
}
return languages[0][0]
}
export default {
Mutation: {
CreatePost: async (resolve, root, args, context, info) => {
args.language = await setPostLanguage(args.content)
args.language = await setPostLanguage(args.content, context.user.locale)
return resolve(root, args, context, info)
},
UpdatePost: async (resolve, root, args, context, info) => {
args.language = await setPostLanguage(args.content)
args.language = await setPostLanguage(args.content, context.user.locale)
return resolve(root, args, context, info)
},
},

View File

@ -20,7 +20,6 @@ const metascraper = Metascraper([
require('metascraper-publisher')(),
require('metascraper-title')(),
require('metascraper-url')(),
require('metascraper-audio')(),
require('metascraper-soundcloud')(),
require('metascraper-video')(),
require('metascraper-youtube')(),

13
webapp/jsconfig.json Normal file
View File

@ -0,0 +1,13 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": [
"./*"
],
"~*": [
"./*"
],
}
}
}