@social-mail/social-mail-web-server 1.4.879 → 1.4.881

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/common/Hashtags.js +1 -1
  2. package/dist/common/Hashtags.js.map +1 -1
  3. package/dist/server/services/tags/TagService.d.ts.map +1 -1
  4. package/dist/server/services/tags/TagService.js +18 -10
  5. package/dist/server/services/tags/TagService.js.map +1 -1
  6. package/dist/tsconfig.tsbuildinfo +1 -1
  7. package/package.json +1 -1
  8. package/src/common/Hashtags.ts +1 -1
  9. package/src/server/services/tags/TagService.ts +18 -11
package/dist/common/Hashtags.js CHANGED
@@ -8,7 +8,7 @@ export default class Hashtags {
8
8
  if (/[,\.;#]$/.test(tag)) {
9
9
  tag = tag.substring(0, tag.length - 1);
10
10
  }
11
- tag = tag.trimEnd();
11
+ tag = tag.trim();
12
12
  if (!tag) {
13
13
  continue;
14
14
  }
package/dist/common/Hashtags.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Hashtags.js","sourceRoot":"","sources":["../../src/common/Hashtags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,IAAI,GAAG,wCAAwC,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAElB,MAAM,CAAC,OAAO,CAAC,IAAY;QAC9B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5B,KAAI,MAAM,IAAI,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;YACzC,CAAC;YACD,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACP,SAAS;YACb,CAAC;YACD,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CAEJ"}
1
+ {"version":3,"file":"Hashtags.js","sourceRoot":"","sources":["../../src/common/Hashtags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,IAAI,GAAG,wCAAwC,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,QAAQ;IAElB,MAAM,CAAC,OAAO,CAAC,IAAY;QAC9B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5B,KAAI,MAAM,IAAI,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;YACzC,CAAC;YACD,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACP,SAAS;YACb,CAAC;YACD,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CAEJ"}
package/dist/server/services/tags/TagService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TagService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/tags/TagService.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,OAAO,UAAU;IAErB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAiDlD"}
1
+ {"version":3,"file":"TagService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/tags/TagService.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,UAAU;IAErB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAuDlD"}
package/dist/server/services/tags/TagService.js CHANGED
@@ -51,6 +51,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
51
51
  var e = new Error(message);
52
52
  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
53
53
  });
54
+ /* eslint-disable no-console */
54
55
  import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
55
56
  import SocialMailContext from "../../model/SocialMailContext.js";
56
57
  let TagService = class TagService {
@@ -60,7 +61,7 @@ let TagService = class TagService {
60
61
  if (!name) {
61
62
  return [];
62
63
  }
63
- name = name.trim().toLocaleLowerCase();
64
+ name = name.trim();
64
65
  if (name.startsWith("#")) {
65
66
  name = name.substring(1);
66
67
  }
@@ -86,15 +87,22 @@ let TagService = class TagService {
86
87
  // return this;
87
88
  // }
88
89
  // } )();
89
- const tag = await db.tags.statements.selectOrInsert({
90
- parentID,
91
- name,
92
- label
93
- }, {
94
- parentID,
95
- name
96
- });
97
- result.push(tag.tagID);
90
+ const lowerCaseName = name.toLocaleLowerCase();
91
+ try {
92
+ const tag = await db.tags.statements.selectOrInsert({
93
+ parentID,
94
+ name,
95
+ label
96
+ }, {
97
+ parentID,
98
+ lowerCaseName
99
+ });
100
+ result.push(tag.tagID);
101
+ }
102
+ catch (error) {
103
+ console.warn(`Warning: Could not add tag ${name}`);
104
+ console.warn(error);
105
+ }
98
106
  return result;
99
107
  }
100
108
  catch (e_1) {
package/dist/server/services/tags/TagService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TagService.js","sourceRoot":"","sources":["../../../../src/server/services/tags/TagService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAIlD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAE3B,KAAK,CAAC,QAAQ,CAAC,IAAY;;;YACvB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC;YACd,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YAED,oFAAoF;YACpF,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACpB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAClC,CAAC;YAED,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,MAAM,KAAK,GAAG,IAAI,CAAC;YAEnB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,GAAI,SAAS,CAAC,CAAC;gBAC3B,QAAQ,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;gBAC3B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACrC,CAAC;YAED,MAAM,KAAK,kCAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAA,CAAC;YAChD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAE5C,0DAA0D;YAC1D,4BAA4B;YAC5B,0BAA0B;YAC1B,uBAAuB;YACvB,QAAQ;YACR,SAAS;YACT,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;gBAChD,QAAQ;gBACR,IAAI;gBACJ,KAAK;aACR,EAAE;gBACC,QAAQ;gBACR,IAAI;aACP,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvB,OAAO,MAAM,CAAC;;;;;;;;;KACjB;CAEJ,CAAA;AAnDoB,UAAU;IAD9B,iBAAiB;GACG,UAAU,CAmD9B;eAnDoB,UAAU"}
1
+ {"version":3,"file":"TagService.js","sourceRoot":"","sources":["../../../../src/server/services/tags/TagService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAIlD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAE3B,KAAK,CAAC,QAAQ,CAAC,IAAY;;;YACvB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC;YACd,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YAED,oFAAoF;YACpF,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACpB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAClC,CAAC;YAED,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,MAAM,KAAK,GAAG,IAAI,CAAC;YAEnB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,GAAI,SAAS,CAAC,CAAC;gBAC3B,QAAQ,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;gBAC3B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACrC,CAAC;YAED,MAAM,KAAK,kCAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAA,CAAC;YAChD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAE5C,0DAA0D;YAC1D,4BAA4B;YAC5B,0BAA0B;YAC1B,uBAAuB;YACvB,QAAQ;YACR,SAAS;YACT,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;oBAChD,QAAQ;oBACR,IAAI;oBACJ,KAAK;iBACR,EAAE;oBACC,QAAQ;oBACR,aAAa;iBAChB,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;gBACnD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC;YAED,OAAO,MAAM,CAAC;;;;;;;;;KACjB;CAEJ,CAAA;AAzDoB,UAAU;IAD9B,iBAAiB;GACG,UAAU,CAyD9B;eAzDoB,UAAU"}