Эх сурвалжийг харах

Merge pull request #74 from overleaf/jpa-ignored-misspellings-via-env

[SpellingAPIManager] get the list of ignored misspellings from settings
Jakob Ackermann 6 жил өмнө
parent
commit
9dd64cd824

+ 2 - 1
services/spelling/app/js/SpellingAPIManager.js

@@ -10,12 +10,13 @@ const ASpell = require('./ASpell')
 const LearnedWordsManager = require('./LearnedWordsManager')
 const LearnedWordsManager = require('./LearnedWordsManager')
 const { callbackify } = require('util')
 const { callbackify } = require('util')
 const OError = require('@overleaf/o-error')
 const OError = require('@overleaf/o-error')
+const Settings = require('settings-sharelatex')
 
 
 // The max number of words checked in a single request
 // The max number of words checked in a single request
 const REQUEST_LIMIT = 10000
 const REQUEST_LIMIT = 10000
 
 
 const SpellingAPIManager = {
 const SpellingAPIManager = {
-  whitelist: ['ShareLaTeX', 'sharelatex', 'LaTeX', 'http', 'https', 'www'],
+  whitelist: Settings.ignoredMisspellings,
 
 
   learnWord(token, request, callback) {
   learnWord(token, request, callback) {
     if (callback == null) {
     if (callback == null) {

+ 13 - 0
services/spelling/config/settings.defaults.js

@@ -22,6 +22,19 @@ module.exports = {
 
 
   healthCheckUserId: '53c64d2fd68c8d000010bb5f',
   healthCheckUserId: '53c64d2fd68c8d000010bb5f',
 
 
+  ignoredMisspellings: process.env.IGNORED_MISSPELLINGS
+    ? process.env.IGNORED_MISSPELLINGS.split(',')
+    : [
+        'Overleaf',
+        'overleaf',
+        'ShareLaTeX',
+        'sharelatex',
+        'LaTeX',
+        'http',
+        'https',
+        'www'
+      ],
+
   sentry: {
   sentry: {
     dsn: process.env.SENTRY_DSN
     dsn: process.env.SENTRY_DSN
   }
   }

+ 1 - 0
services/spelling/test/unit/js/SpellingAPIManagerTests.js

@@ -30,6 +30,7 @@ describe('SpellingAPIManager', function () {
     this.SpellingAPIManager = SandboxedModule.require(modulePath, {
     this.SpellingAPIManager = SandboxedModule.require(modulePath, {
       requires: {
       requires: {
         './ASpell': this.ASpell,
         './ASpell': this.ASpell,
+        'settings-sharelatex': { ignoredMisspellings: ['ShareLaTeX'] },
         './LearnedWordsManager': this.LearnedWordsManager
         './LearnedWordsManager': this.LearnedWordsManager
       }
       }
     })
     })