mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge branch 'master' into 6661-fix-backup-script-for-neo4j-v4
This commit is contained in:
commit
a257e99520
1
.github/workflows/test-backend.yml
vendored
1
.github/workflows/test-backend.yml
vendored
@ -127,6 +127,7 @@ jobs:
|
|||||||
if: ${{ needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true' }}
|
if: ${{ needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true' }}
|
||||||
needs: [files-changed, unit_test_backend]
|
needs: [files-changed, unit_test_backend]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions: write-all
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- name: Delete cache
|
- name: Delete cache
|
||||||
|
|||||||
1
.github/workflows/test-e2e.yml
vendored
1
.github/workflows/test-e2e.yml
vendored
@ -101,6 +101,7 @@ jobs:
|
|||||||
name: Cleanup
|
name: Cleanup
|
||||||
needs: [docker_preparation, fullstack_tests]
|
needs: [docker_preparation, fullstack_tests]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions: write-all
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- name: Delete cache
|
- name: Delete cache
|
||||||
|
|||||||
1
.github/workflows/test-webapp.yml
vendored
1
.github/workflows/test-webapp.yml
vendored
@ -103,6 +103,7 @@ jobs:
|
|||||||
if: ${{ needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true' }}
|
if: ${{ needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true' }}
|
||||||
needs: [files-changed, unit_test_webapp]
|
needs: [files-changed, unit_test_webapp]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions: write-all
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- name: Delete cache
|
- name: Delete cache
|
||||||
|
|||||||
@ -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',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,20 +1,24 @@
|
|||||||
import LanguageDetect from 'languagedetect'
|
import LanguageDetect from 'languagedetect'
|
||||||
import { removeHtmlTags } from '../helpers/cleanHtml'
|
import { removeHtmlTags } from '../helpers/cleanHtml'
|
||||||
|
|
||||||
const setPostLanguage = (text) => {
|
const setPostLanguage = (text, defaultLanguage) => {
|
||||||
const lngDetector = new LanguageDetect()
|
const lngDetector = new LanguageDetect()
|
||||||
lngDetector.setLanguageType('iso2')
|
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 {
|
export default {
|
||||||
Mutation: {
|
Mutation: {
|
||||||
CreatePost: async (resolve, root, args, context, info) => {
|
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)
|
return resolve(root, args, context, info)
|
||||||
},
|
},
|
||||||
UpdatePost: async (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)
|
return resolve(root, args, context, info)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@ -20,7 +20,6 @@ const metascraper = Metascraper([
|
|||||||
require('metascraper-publisher')(),
|
require('metascraper-publisher')(),
|
||||||
require('metascraper-title')(),
|
require('metascraper-title')(),
|
||||||
require('metascraper-url')(),
|
require('metascraper-url')(),
|
||||||
require('metascraper-audio')(),
|
|
||||||
require('metascraper-soundcloud')(),
|
require('metascraper-soundcloud')(),
|
||||||
require('metascraper-video')(),
|
require('metascraper-video')(),
|
||||||
require('metascraper-youtube')(),
|
require('metascraper-youtube')(),
|
||||||
|
|||||||
13
webapp/jsconfig.json
Normal file
13
webapp/jsconfig.json
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"baseUrl": ".",
|
||||||
|
"paths": {
|
||||||
|
"~/*": [
|
||||||
|
"./*"
|
||||||
|
],
|
||||||
|
"~*": [
|
||||||
|
"./*"
|
||||||
|
],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user