@geekity/cms 0.50.0 → 0.51.0

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 (191) hide show
  1. package/admin/pages/documents/editor.njk +40 -1
  2. package/admin/static/admin.css +32 -25
  3. package/dist/admin/assets.d.ts +1 -1
  4. package/dist/admin/assets.d.ts.map +1 -1
  5. package/dist/admin/assets.js +3 -5
  6. package/dist/admin/assets.js.map +1 -1
  7. package/dist/admin/documents.d.ts.map +1 -1
  8. package/dist/admin/documents.js +28 -4
  9. package/dist/admin/documents.js.map +1 -1
  10. package/dist/admin/editor-layout.js +2 -2
  11. package/dist/admin/editor-layout.js.map +1 -1
  12. package/dist/admin/routes.js +1 -1
  13. package/dist/admin/routes.js.map +1 -1
  14. package/dist/admin/settings-general.js +4 -3
  15. package/dist/admin/settings-general.js.map +1 -1
  16. package/dist/admin/wiki-mentions.d.ts +31 -0
  17. package/dist/admin/wiki-mentions.d.ts.map +1 -0
  18. package/dist/admin/wiki-mentions.js +129 -0
  19. package/dist/admin/wiki-mentions.js.map +1 -0
  20. package/dist/avatars/avatars.d.ts +12 -9
  21. package/dist/avatars/avatars.d.ts.map +1 -1
  22. package/dist/avatars/avatars.js +66 -33
  23. package/dist/avatars/avatars.js.map +1 -1
  24. package/dist/cms/services.d.ts.map +1 -1
  25. package/dist/cms/services.js +12 -1
  26. package/dist/cms/services.js.map +1 -1
  27. package/dist/content/document-form.d.ts +2 -0
  28. package/dist/content/document-form.d.ts.map +1 -1
  29. package/dist/content/document-form.js +10 -0
  30. package/dist/content/document-form.js.map +1 -1
  31. package/dist/content/document-kind.d.ts +5 -0
  32. package/dist/content/document-kind.d.ts.map +1 -1
  33. package/dist/content/document-kind.js +3 -0
  34. package/dist/content/document-kind.js.map +1 -1
  35. package/dist/content/image-tags.d.ts +5 -1
  36. package/dist/content/image-tags.d.ts.map +1 -1
  37. package/dist/content/image-tags.js +8 -11
  38. package/dist/content/image-tags.js.map +1 -1
  39. package/dist/content/sqlite/backlinks.d.ts.map +1 -1
  40. package/dist/content/sqlite/backlinks.js +4 -3
  41. package/dist/content/sqlite/backlinks.js.map +1 -1
  42. package/dist/content/sqlite/lookups.d.ts.map +1 -1
  43. package/dist/content/sqlite/lookups.js +6 -2
  44. package/dist/content/sqlite/lookups.js.map +1 -1
  45. package/dist/content/sqlite/schema.d.ts.map +1 -1
  46. package/dist/content/sqlite/schema.js +18 -0
  47. package/dist/content/sqlite/schema.js.map +1 -1
  48. package/dist/content/sqlite/writes.d.ts.map +1 -1
  49. package/dist/content/sqlite/writes.js +6 -0
  50. package/dist/content/sqlite/writes.js.map +1 -1
  51. package/dist/content/store.d.ts +3 -3
  52. package/dist/content/uploads.js +2 -3
  53. package/dist/content/uploads.js.map +1 -1
  54. package/dist/content/wiki-aliases.d.ts +23 -0
  55. package/dist/content/wiki-aliases.d.ts.map +1 -0
  56. package/dist/content/wiki-aliases.js +45 -0
  57. package/dist/content/wiki-aliases.js.map +1 -0
  58. package/dist/content/wiki-mentions.d.ts +30 -0
  59. package/dist/content/wiki-mentions.d.ts.map +1 -0
  60. package/dist/content/wiki-mentions.js +120 -0
  61. package/dist/content/wiki-mentions.js.map +1 -0
  62. package/dist/content/write.d.ts +2 -2
  63. package/dist/content/write.d.ts.map +1 -1
  64. package/dist/content/write.js +26 -3
  65. package/dist/content/write.js.map +1 -1
  66. package/dist/files/static-files.js +7 -4
  67. package/dist/files/static-files.js.map +1 -1
  68. package/dist/files/upload-types.d.ts +2 -5
  69. package/dist/files/upload-types.d.ts.map +1 -1
  70. package/dist/files/upload-types.js +2 -5
  71. package/dist/files/upload-types.js.map +1 -1
  72. package/dist/fonts/index.d.ts +1 -1
  73. package/dist/fonts/index.d.ts.map +1 -1
  74. package/dist/fonts/index.js +1 -1
  75. package/dist/fonts/index.js.map +1 -1
  76. package/dist/fonts/roles.d.ts +11 -2
  77. package/dist/fonts/roles.d.ts.map +1 -1
  78. package/dist/fonts/roles.js +57 -11
  79. package/dist/fonts/roles.js.map +1 -1
  80. package/dist/fonts/store.d.ts.map +1 -1
  81. package/dist/fonts/store.js +9 -7
  82. package/dist/fonts/store.js.map +1 -1
  83. package/dist/images/derived-sets.d.ts +56 -0
  84. package/dist/images/derived-sets.d.ts.map +1 -0
  85. package/dist/images/derived-sets.js +116 -0
  86. package/dist/images/derived-sets.js.map +1 -0
  87. package/dist/images/icon-setting.d.ts.map +1 -1
  88. package/dist/images/icon-setting.js +6 -10
  89. package/dist/images/icon-setting.js.map +1 -1
  90. package/dist/images/icons.d.ts +16 -13
  91. package/dist/images/icons.d.ts.map +1 -1
  92. package/dist/images/icons.js +103 -43
  93. package/dist/images/icons.js.map +1 -1
  94. package/dist/images/markup.d.ts.map +1 -1
  95. package/dist/images/markup.js +2 -12
  96. package/dist/images/markup.js.map +1 -1
  97. package/dist/images/paths.d.ts +32 -1
  98. package/dist/images/paths.d.ts.map +1 -1
  99. package/dist/images/paths.js +27 -3
  100. package/dist/images/paths.js.map +1 -1
  101. package/dist/images/variants.d.ts +34 -32
  102. package/dist/images/variants.d.ts.map +1 -1
  103. package/dist/images/variants.js +157 -168
  104. package/dist/images/variants.js.map +1 -1
  105. package/dist/mcp/authoring/wiki.d.ts.map +1 -1
  106. package/dist/mcp/authoring/wiki.js +20 -5
  107. package/dist/mcp/authoring/wiki.js.map +1 -1
  108. package/dist/media/library.js +3 -3
  109. package/dist/media/library.js.map +1 -1
  110. package/dist/theme/assets.d.ts +8 -0
  111. package/dist/theme/assets.d.ts.map +1 -1
  112. package/dist/theme/assets.js +92 -9
  113. package/dist/theme/assets.js.map +1 -1
  114. package/dist/util/public-address.d.ts +19 -1
  115. package/dist/util/public-address.d.ts.map +1 -1
  116. package/dist/util/public-address.js +51 -1
  117. package/dist/util/public-address.js.map +1 -1
  118. package/dist/util/queue.d.ts +5 -0
  119. package/dist/util/queue.d.ts.map +1 -1
  120. package/dist/util/queue.js +21 -0
  121. package/dist/util/queue.js.map +1 -1
  122. package/dist/util/url.d.ts +10 -0
  123. package/dist/util/url.d.ts.map +1 -1
  124. package/dist/util/url.js +27 -0
  125. package/dist/util/url.js.map +1 -1
  126. package/dist/web/asset-routes.d.ts.map +1 -1
  127. package/dist/web/asset-routes.js +33 -33
  128. package/dist/web/asset-routes.js.map +1 -1
  129. package/dist/web/avatar-routes.d.ts.map +1 -1
  130. package/dist/web/avatar-routes.js +5 -7
  131. package/dist/web/avatar-routes.js.map +1 -1
  132. package/dist/web/compression.d.ts +1 -0
  133. package/dist/web/compression.d.ts.map +1 -1
  134. package/dist/web/compression.js +22 -8
  135. package/dist/web/compression.js.map +1 -1
  136. package/dist/web/conversation-feed.d.ts +15 -4
  137. package/dist/web/conversation-feed.d.ts.map +1 -1
  138. package/dist/web/conversation-feed.js +31 -5
  139. package/dist/web/conversation-feed.js.map +1 -1
  140. package/dist/web/document-page.js +2 -2
  141. package/dist/web/document-page.js.map +1 -1
  142. package/dist/web/feed-item.d.ts +3 -1
  143. package/dist/web/feed-item.d.ts.map +1 -1
  144. package/dist/web/feed-item.js +5 -1
  145. package/dist/web/feed-item.js.map +1 -1
  146. package/dist/web/feed-routes.d.ts.map +1 -1
  147. package/dist/web/feed-routes.js +2 -0
  148. package/dist/web/feed-routes.js.map +1 -1
  149. package/dist/web/feed-rss.d.ts.map +1 -1
  150. package/dist/web/feed-rss.js +25 -2
  151. package/dist/web/feed-rss.js.map +1 -1
  152. package/dist/web/feed-source.d.ts +10 -3
  153. package/dist/web/feed-source.d.ts.map +1 -1
  154. package/dist/web/feed-source.js.map +1 -1
  155. package/dist/web/feeds.js +1 -1
  156. package/dist/web/feeds.js.map +1 -1
  157. package/dist/web/font-routes.d.ts.map +1 -1
  158. package/dist/web/font-routes.js +2 -4
  159. package/dist/web/font-routes.js.map +1 -1
  160. package/dist/web/markdown-representation.js +2 -2
  161. package/dist/web/markdown-representation.js.map +1 -1
  162. package/dist/web/opensearch.js +2 -2
  163. package/dist/web/opensearch.js.map +1 -1
  164. package/dist/web/paths.js +1 -1
  165. package/dist/web/paths.js.map +1 -1
  166. package/dist/web/request.d.ts +6 -2
  167. package/dist/web/request.d.ts.map +1 -1
  168. package/dist/web/request.js +9 -7
  169. package/dist/web/request.js.map +1 -1
  170. package/dist/web/routes.d.ts.map +1 -1
  171. package/dist/web/routes.js +2 -1
  172. package/dist/web/routes.js.map +1 -1
  173. package/dist/web/site-index.js +2 -2
  174. package/dist/web/site-index.js.map +1 -1
  175. package/dist/webmention/cited-picture.d.ts.map +1 -1
  176. package/dist/webmention/cited-picture.js +2 -1
  177. package/dist/webmention/cited-picture.js.map +1 -1
  178. package/dist/webmention/fetch-public.d.ts.map +1 -1
  179. package/dist/webmention/fetch-public.js +5 -3
  180. package/dist/webmention/fetch-public.js.map +1 -1
  181. package/dist/webmention/reply-context/feed.d.ts +26 -0
  182. package/dist/webmention/reply-context/feed.d.ts.map +1 -0
  183. package/dist/webmention/reply-context/feed.js +107 -0
  184. package/dist/webmention/reply-context/feed.js.map +1 -0
  185. package/dist/webmention/reply-context.d.ts +5 -1
  186. package/dist/webmention/reply-context.d.ts.map +1 -1
  187. package/dist/webmention/reply-context.js +21 -10
  188. package/dist/webmention/reply-context.js.map +1 -1
  189. package/dist/webmention/reply-contexts.js +5 -0
  190. package/dist/webmention/reply-contexts.js.map +1 -1
  191. package/package.json +5 -2
@@ -7,7 +7,7 @@
7
7
  * user's, edited on the users screen beside the rest of their profile.
8
8
  */
9
9
  import { userForAuthor } from '../content/authors.js';
10
- import { iconSetting, siteIcons } from '../images/icons.js';
10
+ import { deriveSiteIcons, iconSetting, siteIcons } from '../images/icons.js';
11
11
  import { effectiveBaseUrl } from '../site/settings.js';
12
12
  import { listUsers } from '../site/users.js';
13
13
  import { stringOrEmpty } from '../util/forms.js';
@@ -56,7 +56,7 @@ export const GENERAL_SETTINGS = {
56
56
  panels: async (c, settings) => ({
57
57
  ...(await tmdbPanel(c.var.settings)),
58
58
  ...baseUrlPanel(c.var.config, settings),
59
- ...iconPanel(c.var.config, settings),
59
+ ...(await iconPanel(c.var.config, settings)),
60
60
  licenseChoices: Object.entries(CREATIVE_COMMONS_LICENSES).map(([key, license]) => ({
61
61
  key,
62
62
  name: `${license.name}, ${license.title}`,
@@ -119,8 +119,9 @@ function siteAuthorUsername(config, author) {
119
119
  function iconInEffect(settings) {
120
120
  return iconSetting({ icon: settings.icon, avatar: settings.avatar });
121
121
  }
122
- function iconPanel(config, settings) {
122
+ async function iconPanel(config, settings) {
123
123
  const inEffect = iconInEffect(settings);
124
+ await deriveSiteIcons(config, inEffect);
124
125
  const preview = siteIcons(config, inEffect).find((icon) => icon.rel === 'apple-touch-icon');
125
126
  return {
126
127
  iconInEffect: inEffect ?? '',
@@ -1 +1 @@
1
- {"version":3,"file":"settings-general.js","sourceRoot":"","sources":["../../src/admin/settings-general.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,iCAAiC;AACjC,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC5C,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC,eAAe;IACzC,MAAM,EAAE;QACN,OAAO;QACP,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,UAAU;QACV,QAAQ;QACR,MAAM;QACN,aAAa;QACb,SAAS;QACT,aAAa;QACb,cAAc;KACf;IAED,0EAA0E;IAC1E,8EAA8E;IAC9E,uEAAuE;IACvE,EAAE;IACF,yEAAyE;IACzE,uEAAuE;IACvE,6DAA6D;IAC7D,2BAA2B;IAC3B,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5B,GAAG,QAAQ;QACX,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC;QAC5C,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;QACnD,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE;KACnC,CAAC;IAEF,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9B,GAAG,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;QACvC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;QACpC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACjF,GAAG;YACH,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,KAAK,EAAE;SAC1C,CAAC,CAAC;QACH,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5D,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,QAAQ;SACjD,CAAC,CAAC;KACJ,CAAC;IAEF,yEAAyE;IACzE,0EAA0E;IAC1E,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;KACtF,CAAC;IAEF,SAAS,EAAE,SAAS;CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,aAAa,OAAO,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAW,CAAC;AAE1E,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAEpC,SAAS,SAAS,CAAC,GAAqB;IACtC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;IAEnC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QAE3B,IAAI,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;YAC5D,MAAM,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5C,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,oDAAoD,CAAC,CAAC;YACzE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;YACf,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,iEAAiE,CAAC,CAAC;YACrF,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,CAAkB,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5F,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACd,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACnF,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/B,CAAC;QACD,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,sEAAsE,CAAC,CAAC;QAC3F,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,QAA0B;IACjD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1D,OAAO;QACL,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,WAAW;QACvB,UAAU,EAAE,WAAW;QACvB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,GAAG,KAAK,EAAE;QACvB,WAAW,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,EAAE;KAC7F,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,SAAS,kBAAkB,CAAC,MAAuC,EAAE,MAAc;IACjF,OAAO,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,YAAY,CAAC,QAAsB;IAC1C,OAAO,WAAW,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,SAAS,CAAC,MAAsB,EAAE,QAAsB;IAC/D,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,kBAAkB,CAAC,CAAC;IAE5F,OAAO;QACL,YAAY,EAAE,QAAQ,IAAI,EAAE;QAC5B,WAAW,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE;QAChC,cAAc,EAAE,QAAQ,CAAC,IAAI,KAAK,EAAE,IAAI,QAAQ,KAAK,SAAS;QAC9D,aAAa,EAAE,QAAQ,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS;QAC9D,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC5C,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,SAAS,YAAY,CACnB,MAAyD,EACzD,QAAsB;IAEtB,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,KAAK,SAAS,CAAC;IAEtD,OAAO;QACL,eAAe,EAAE,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC;QACnD,iBAAiB,EAAE,UAAU;QAC7B,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,WAAW,EAAE,UAAU;YACrB,CAAC,CAAC,MAAM,CAAC,aAAa,KAAK,aAAa;gBACtC,CAAC,CAAC,+FAA+F;gBACjG,CAAC,CAAC,oGAAoG;YACxG,CAAC,CAAC,yFAAyF;KAC9F,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"settings-general.js","sourceRoot":"","sources":["../../src/admin/settings-general.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,31 @@
1
+ import type { Context } from 'hono';
2
+ import type { Document, DocumentType } from '../content/document.ts';
3
+ import type { GeekityEnv } from '../web/env.ts';
4
+ /** The field a Link button submits: the path of the document to link. */
5
+ export declare const LINK_FIELD = "link";
6
+ /** The field the Link all button submits. */
7
+ export declare const LINK_ALL_FIELD = "link-all";
8
+ /** One document in the Unlinked mentions panel. */
9
+ export interface MentionRow {
10
+ readonly path: string;
11
+ readonly type: DocumentType;
12
+ readonly slug: string;
13
+ readonly title: string;
14
+ readonly status: 'Draft' | 'Scheduled' | 'Published';
15
+ /** Whether saving it sends followers an update. */
16
+ readonly federated: boolean;
17
+ readonly before: string;
18
+ readonly text: string;
19
+ readonly after: string;
20
+ }
21
+ /**
22
+ * Every live post, page and wiki page but the page itself, drafts included,
23
+ * that mentions the page without linking to it, by title.
24
+ */
25
+ export declare function mentionRows(c: Context<GeekityEnv>, page: Document): MentionRow[];
26
+ /**
27
+ * Link the documents a Link or Link all button asked for, each from its
28
+ * current text, and say what happened in flashes.
29
+ */
30
+ export declare function linkMentions(c: Context<GeekityEnv>, page: Document, form: Record<string, unknown>): Promise<void>;
31
+ //# sourceMappingURL=wiki-mentions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"wiki-mentions.d.ts","sourceRoot":"","sources":["../../src/admin/wiki-mentions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAarE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIhD,yEAAyE;AACzE,eAAO,MAAM,UAAU,SAAS,CAAC;AACjC,6CAA6C;AAC7C,eAAO,MAAM,cAAc,aAAa,CAAC;AAQzC,mDAAmD;AACnD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,WAAW,GAAG,WAAW,CAAC;IACrD,mDAAmD;IACnD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAOD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,QAAQ,GAAG,UAAU,EAAE,CAehF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,IAAI,CAAC,CAuBf"}
@@ -0,0 +1,129 @@
1
+ import { formFor } from '../content/document-form.js';
2
+ import { PAGE_KIND, POST_KIND, WIKI_KIND } from '../content/document-kind.js';
3
+ import { postLocations } from '../content/locations.js';
4
+ import { postLabel } from '../content/post-type.js';
5
+ import { scheduledFor } from '../content/schedule.js';
6
+ import { isFederatedDocument } from '../content/served.js';
7
+ import { isTrashedPath } from '../content/store.js';
8
+ import { linkMention, mentionTargetOf, unlinkedMention } from '../content/wiki-mentions.js';
9
+ import { writeDocument } from '../content/write.js';
10
+ import { documentSite } from '../web/document-site.js';
11
+ import { stringOrEmpty } from '../util/forms.js';
12
+ import { flash } from './flash.js';
13
+ /** The field a Link button submits: the path of the document to link. */
14
+ export const LINK_FIELD = 'link';
15
+ /** The field the Link all button submits. */
16
+ export const LINK_ALL_FIELD = 'link-all';
17
+ const KINDS = {
18
+ post: POST_KIND,
19
+ page: PAGE_KIND,
20
+ wiki: WIKI_KIND,
21
+ };
22
+ /**
23
+ * Every live post, page and wiki page but the page itself, drafts included,
24
+ * that mentions the page without linking to it, by title.
25
+ */
26
+ export function mentionRows(c, page) {
27
+ const now = c.var.store.now();
28
+ return unlinkedMentions(c, page).map(({ document, mention }) => ({
29
+ path: document.path,
30
+ type: document.type,
31
+ slug: document.slug,
32
+ title: label(c, document),
33
+ status: document.draft
34
+ ? 'Draft'
35
+ : scheduledFor(document, now) === undefined
36
+ ? 'Published'
37
+ : 'Scheduled',
38
+ federated: isFederatedDocument(document, now),
39
+ ...around(document.body, mention),
40
+ }));
41
+ }
42
+ /**
43
+ * Link the documents a Link or Link all button asked for, each from its
44
+ * current text, and say what happened in flashes.
45
+ */
46
+ export async function linkMentions(c, page, form) {
47
+ const target = mentionTargetOf(page);
48
+ const paths = form[LINK_ALL_FIELD] === undefined
49
+ ? [stringOrEmpty(form[LINK_FIELD])]
50
+ : unlinkedMentions(c, page).map(({ document }) => document.path);
51
+ const linked = [];
52
+ for (const path of paths) {
53
+ const document = c.var.store.getByPath(path);
54
+ if (document === undefined || isTrashedPath(document.path) || document.path === page.path) {
55
+ flash(c, 'warning', 'That document cannot be linked from here.');
56
+ continue;
57
+ }
58
+ const outcome = await linkFirstMention(c, document, target);
59
+ if (outcome === 'linked')
60
+ linked.push(label(c, document));
61
+ else
62
+ flash(c, outcome.kind, outcome.message);
63
+ }
64
+ if (linked.length > 0) {
65
+ const noun = linked.length === 1 ? 'document' : 'documents';
66
+ flash(c, 'notice', `Linked ${String(linked.length)} ${noun}: ${linked.join(', ')}`);
67
+ }
68
+ }
69
+ async function linkFirstMention(c, document, target) {
70
+ const name = label(c, document);
71
+ const mention = unlinkedMention(document.body, target);
72
+ if (mention === undefined) {
73
+ return {
74
+ kind: 'warning',
75
+ message: `${name} no longer mentions this page without linking to it.`,
76
+ };
77
+ }
78
+ const kind = KINDS[document.type];
79
+ const location = postLocations(c.var.config.dataDir).read(document.permalink);
80
+ const form = formFor(kind, document, c.var.siteAtRequestStart.timezone, location);
81
+ const written = await writeDocument(documentSite(c), {
82
+ kind,
83
+ document,
84
+ form: { ...form, body: linkMention(document.body, mention, target) },
85
+ draft: document.draft,
86
+ });
87
+ switch (written.outcome) {
88
+ case 'saved':
89
+ return 'linked';
90
+ case 'conflict':
91
+ return {
92
+ kind: 'error',
93
+ message: `${name} changed on disk since it was last read, so it was not linked. Try again once it has been read again.`,
94
+ };
95
+ case 'refused':
96
+ return { kind: 'error', message: `${name} was not linked: ${written.message}` };
97
+ }
98
+ }
99
+ function unlinkedMentions(c, page) {
100
+ const target = mentionTargetOf(page);
101
+ const found = [];
102
+ for (const document of c.var.store.listAll({ draft: undefined, trashed: false })) {
103
+ if (document.path === page.path)
104
+ continue;
105
+ const mention = unlinkedMention(document.body, target);
106
+ if (mention !== undefined)
107
+ found.push({ document, mention });
108
+ }
109
+ return found.sort((a, b) => label(c, a.document).localeCompare(label(c, b.document)));
110
+ }
111
+ function label(c, document) {
112
+ return postLabel(document, (url) => c.var.replyContexts.read(url, c.var.siteAtRequestStart));
113
+ }
114
+ const CONTEXT = 60;
115
+ function around(body, mention) {
116
+ const start = Math.max(0, mention.from - CONTEXT);
117
+ const end = Math.min(body.length, mention.to + CONTEXT);
118
+ let before = oneLine(body.slice(start, mention.from));
119
+ let after = oneLine(body.slice(mention.to, end));
120
+ if (start > 0)
121
+ before = `…${before.replace(/^\S*\s/, '')}`;
122
+ if (end < body.length)
123
+ after = `${after.replace(/\s\S*$/, '')}…`;
124
+ return { before, text: mention.text, after };
125
+ }
126
+ function oneLine(text) {
127
+ return text.replace(/\s+/g, ' ');
128
+ }
129
+ //# sourceMappingURL=wiki-mentions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"wiki-mentions.js","sourceRoot":"","sources":["../../src/admin/wiki-mentions.ts"],"names":[],"mappings":"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"}
@@ -12,10 +12,12 @@ import type { NotificationTimers } from '../notifications/digest.ts';
12
12
  * the size the theme shows it at and keeps the result.
13
13
  *
14
14
  * The key is the source URL itself, base64url-encoded, and it is only a
15
- * spelling: a request is answered only when the index says the URL is an
16
- * avatar the site has recorded ({@link AdminStore.isAvatarSource}). Anything
17
- * else is a 404 that fetches nothing, so this is not an open proxy, and there
18
- * is no table or secret to lose.
15
+ * spelling: a picture is fetched only when the index says the URL is an
16
+ * avatar the site has recorded ({@link AdminStore.isAvatarSource}). Any
17
+ * other key is answered with the placeholder, the same answer a recorded
18
+ * avatar gets before it is fetched, so this is not an open proxy, nobody can
19
+ * tell from the answer whether an actor has reached the site, and there is
20
+ * no table or secret to lose.
19
21
  *
20
22
  * The files under `<dataDir>/avatars/` are a disposable cache:
21
23
  * every one of them is named by the hash of a URL the index holds and can be
@@ -47,6 +49,8 @@ export declare const AVATAR_MAX_AGE_MS: number;
47
49
  export declare const AVATAR_RETRY_MS: number;
48
50
  /** How often the sweep runs. */
49
51
  export declare const AVATAR_SWEEP_MS: number;
52
+ /** How many pictures are fetched and decoded at once, requests and sweep together. */
53
+ export declare const AVATAR_FETCH_LIMIT = 4;
50
54
  /** How long a browser keeps a picture, in seconds. */
51
55
  export declare const AVATAR_MAX_AGE_SECONDS = 86400;
52
56
  /** How long a browser keeps the placeholder, so the next view asks again. */
@@ -63,8 +67,6 @@ export type AvatarAnswer = {
63
67
  readonly asset: StaticAsset;
64
68
  } | {
65
69
  readonly kind: 'placeholder';
66
- } | {
67
- readonly kind: 'unknown';
68
70
  };
69
71
  /** Where the service reports a picture it could not fetch. */
70
72
  export interface AvatarLogger {
@@ -87,9 +89,10 @@ export interface CreateAvatarServiceOptions {
87
89
  export interface AvatarService {
88
90
  /**
89
91
  * The answer to a request for the avatar at `source`: the cached picture,
90
- * the placeholder when there is none to be had yet, or `unknown` for a URL
91
- * the site has not recorded. Fetches only for a recorded URL with nothing
92
- * cached, and waits for that fetch no longer than the first-view bound.
92
+ * or the placeholder when there is none to be had yet, and always the
93
+ * placeholder for a URL the site has not recorded. Fetches only for a
94
+ * recorded URL with nothing cached, and waits for that fetch no longer than
95
+ * the first-view bound.
93
96
  */
94
97
  answer(source: string): Promise<AvatarAnswer>;
95
98
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"avatars.d.ts","sourceRoot":"","sources":["../../src/avatars/avatars.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAInD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAKrE;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,WAAW,KAAK,CAAC;AAE9B,yEAAyE;AACzE,eAAO,MAAM,gBAAgB,UAAY,CAAC;AAE1C,kDAAkD;AAClD,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,uEAAuE;AACvE,eAAO,MAAM,iBAAiB,QAA0B,CAAC;AAEzD,8DAA8D;AAC9D,eAAO,MAAM,eAAe,QAAiB,CAAC;AAE9C,gCAAgC;AAChC,eAAO,MAAM,eAAe,QAAqB,CAAC;AAElD,sDAAsD;AACtD,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,6EAA6E;AAC7E,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAEtD,yEAAyE;AACzE,eAAO,MAAM,sBAAsB,uRAA6P,CAAC;AAWjS,uEAAuE;AACvE,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO9D;AAED,qDAAqD;AACrD,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GACvD;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;CAAE,GAChC;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAEjC,8DAA8D;AAC9D,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,8CAA8C;AAC9C,MAAM,WAAW,0BAA0B;IACzC,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,mBAAmB,CAAC,CAAC;IACzE,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC,CAAC;IACxE,2CAA2C;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACjD,qDAAqD;IACrD,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CAC5C;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9C;;;;OAIG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,oEAAoE;IACpE,KAAK,IAAI,IAAI,CAAC;IACd,mGAAmG;IACnG,IAAI,IAAI,IAAI,CAAC;IACb,iEAAiE;IACjE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,6CAA6C;AAC7C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa,CAgItF"}
1
+ {"version":3,"file":"avatars.d.ts","sourceRoot":"","sources":["../../src/avatars/avatars.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAInD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAKrE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,WAAW,KAAK,CAAC;AAE9B,yEAAyE;AACzE,eAAO,MAAM,gBAAgB,UAAY,CAAC;AAE1C,kDAAkD;AAClD,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,uEAAuE;AACvE,eAAO,MAAM,iBAAiB,QAA0B,CAAC;AAEzD,8DAA8D;AAC9D,eAAO,MAAM,eAAe,QAAiB,CAAC;AAE9C,gCAAgC;AAChC,eAAO,MAAM,eAAe,QAAqB,CAAC;AAElD,sFAAsF;AACtF,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAKpC,sDAAsD;AACtD,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,6EAA6E;AAC7E,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAEtD,yEAAyE;AACzE,eAAO,MAAM,sBAAsB,uRAA6P,CAAC;AAgBjS,uEAAuE;AACvE,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO9D;AAED,qDAAqD;AACrD,MAAM,MAAM,YAAY,GACtB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAE7F,8DAA8D;AAC9D,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,8CAA8C;AAC9C,MAAM,WAAW,0BAA0B;IACzC,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,mBAAmB,CAAC,CAAC;IACzE,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,GAAG,KAAK,CAAC,CAAC;IACxE,2CAA2C;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACjD,qDAAqD;IACrD,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CAC5C;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9C;;;;OAIG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,oEAAoE;IACpE,KAAK,IAAI,IAAI,CAAC;IACd,mGAAmG;IACnG,IAAI,IAAI,IAAI,CAAC;IACb,iEAAiE;IACjE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,6CAA6C;AAC7C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa,CAmJtF"}
@@ -4,9 +4,10 @@ import sharp from 'sharp';
4
4
  import { writeFileAtomically } from '../files/atomic.js';
5
5
  import { AVATARS, dataFolder, dataPath } from '../files/data-files.js';
6
6
  import { findAsset } from '../files/static-files.js';
7
+ import { UPLOAD_MEDIA_TYPES, matchesSignature } from '../files/upload-types.js';
7
8
  import { systemNotificationTimers } from '../notifications/digest.js';
8
9
  import { messageOf } from '../util/errors.js';
9
- import { createSerialQueue } from '../util/queue.js';
10
+ import { createConcurrencyLimit, createSerialQueue } from '../util/queue.js';
10
11
  import { fetchPublic, webUrl } from '../webmention/fetch-public.js';
11
12
  /**
12
13
  * Remote avatars, served from this site.
@@ -18,10 +19,12 @@ import { fetchPublic, webUrl } from '../webmention/fetch-public.js';
18
19
  * the size the theme shows it at and keeps the result.
19
20
  *
20
21
  * The key is the source URL itself, base64url-encoded, and it is only a
21
- * spelling: a request is answered only when the index says the URL is an
22
- * avatar the site has recorded ({@link AdminStore.isAvatarSource}). Anything
23
- * else is a 404 that fetches nothing, so this is not an open proxy, and there
24
- * is no table or secret to lose.
22
+ * spelling: a picture is fetched only when the index says the URL is an
23
+ * avatar the site has recorded ({@link AdminStore.isAvatarSource}). Any
24
+ * other key is answered with the placeholder, the same answer a recorded
25
+ * avatar gets before it is fetched, so this is not an open proxy, nobody can
26
+ * tell from the answer whether an actor has reached the site, and there is
27
+ * no table or secret to lose.
25
28
  *
26
29
  * The files under `<dataDir>/avatars/` are a disposable cache:
27
30
  * every one of them is named by the hash of a URL the index holds and can be
@@ -53,6 +56,10 @@ export const AVATAR_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
53
56
  export const AVATAR_RETRY_MS = 60 * 60 * 1000;
54
57
  /** How often the sweep runs. */
55
58
  export const AVATAR_SWEEP_MS = 6 * 60 * 60 * 1000;
59
+ /** How many pictures are fetched and decoded at once, requests and sweep together. */
60
+ export const AVATAR_FETCH_LIMIT = 4;
61
+ const FIRST_VIEW_SLOTS = 2;
62
+ const SWEEP_PARALLEL = AVATAR_FETCH_LIMIT - FIRST_VIEW_SLOTS;
56
63
  /** How long a browser keeps a picture, in seconds. */
57
64
  export const AVATAR_MAX_AGE_SECONDS = 86_400;
58
65
  /** How long a browser keeps the placeholder, so the next view asks again. */
@@ -61,8 +68,13 @@ export const AVATAR_PLACEHOLDER_MAX_AGE_SECONDS = 300;
61
68
  export const AVATAR_PLACEHOLDER_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80" width="80" height="80"><rect width="80" height="80" fill="#d7d7d7"/><circle cx="40" cy="31" r="15" fill="#f5f5f5"/><path d="M12 80c0-17 12.5-27 28-27s28 10 28 27z" fill="#f5f5f5"/></svg>\n`;
62
69
  /** The content types a picture may arrive as. SVG is not one: it is a document. */
63
70
  const ACCEPTED_TYPES = /^\s*image\/(jpeg|png|gif|webp|avif)\s*(;|$)/i;
64
- /** What sharp must find the bytes to be, whatever the header said. AVIF reads as `heif`. */
65
- const ACCEPTED_FORMATS = new Set(['jpeg', 'png', 'gif', 'webp', 'heif']);
71
+ /**
72
+ * What the bytes must open with, whatever the header said, before sharp sees
73
+ * them: so only the decoders for these formats ever read a stranger's file.
74
+ */
75
+ const ACCEPTED_SIGNATURES = ['.jpg', '.png', '.gif', '.webp', '.avif']
76
+ .map((extension) => UPLOAD_MEDIA_TYPES.get(extension))
77
+ .filter((media) => media !== undefined);
66
78
  /** The most pixels a picture may have before sharp will not decode it. */
67
79
  const MAX_INPUT_PIXELS = 4096 * 4096;
68
80
  /** The same-origin URL a theme is handed for an avatar at `source`. */
@@ -89,6 +101,7 @@ export function createAvatarService(options) {
89
101
  const directory = dataFolder(config.dataDir, AVATARS);
90
102
  const avatarFile = (name) => dataPath(config.dataDir, AVATARS, name);
91
103
  const inFlight = new Map();
104
+ const fetches = createConcurrencyLimit(AVATAR_FETCH_LIMIT);
92
105
  const sweeps = createSerialQueue();
93
106
  let handle;
94
107
  let untilStopped = new AbortController();
@@ -108,7 +121,14 @@ export function createAvatarService(options) {
108
121
  const running = inFlight.get(source);
109
122
  if (running !== undefined)
110
123
  return running;
111
- const started = fetchInto(source, untilStopped.signal).finally(() => inFlight.delete(source));
124
+ const { signal } = untilStopped;
125
+ const started = fetches
126
+ .run(() => fetchInto(source, signal))
127
+ .catch((thrown) => {
128
+ logger.warn(`Could not keep the avatar at ${source}: ${messageOf(thrown)}`);
129
+ return false;
130
+ })
131
+ .finally(() => inFlight.delete(source));
112
132
  inFlight.set(source, started);
113
133
  return started;
114
134
  }
@@ -132,22 +152,29 @@ export function createAvatarService(options) {
132
152
  async function sweepOnce() {
133
153
  const { signal } = untilStopped;
134
154
  const sources = admin.listAvatarSources();
135
- const keep = new Set();
136
- for (const source of sources) {
137
- if (signal.aborted)
138
- return;
139
- keep.add(imageName(source));
140
- keep.add(failedName(source));
141
- if (webUrl(source) === undefined)
142
- continue;
143
- const age = await ageOf(imageName(source));
144
- if (age !== undefined && age < AVATAR_MAX_AGE_MS)
145
- continue;
146
- const failedAge = await ageOf(failedName(source));
147
- if (age === undefined && failedAge !== undefined && failedAge < AVATAR_RETRY_MS)
148
- continue;
149
- await refresh(source);
155
+ let next = 0;
156
+ async function refreshDue() {
157
+ while (!signal.aborted) {
158
+ const source = sources[next];
159
+ next += 1;
160
+ if (source === undefined)
161
+ return;
162
+ if (webUrl(source) === undefined)
163
+ continue;
164
+ const age = await ageOf(imageName(source));
165
+ if (age !== undefined && age < AVATAR_MAX_AGE_MS)
166
+ continue;
167
+ const failedAge = await ageOf(failedName(source));
168
+ if (age === undefined && failedAge !== undefined && failedAge < AVATAR_RETRY_MS)
169
+ continue;
170
+ if (signal.aborted)
171
+ return;
172
+ await refresh(source);
173
+ }
150
174
  }
175
+ await Promise.all(Array.from({ length: SWEEP_PARALLEL }, refreshDue));
176
+ if (signal.aborted)
177
+ return;
151
178
  let names;
152
179
  try {
153
180
  names = await readdir(directory);
@@ -155,9 +182,11 @@ export function createAvatarService(options) {
155
182
  catch {
156
183
  return;
157
184
  }
185
+ const recordedAfterReading = new Set(admin.listAvatarSources().flatMap((source) => [imageName(source), failedName(source)]));
158
186
  for (const name of names) {
159
- if (!keep.has(name))
160
- await rm(avatarFile(name), { force: true });
187
+ if (recordedAfterReading.has(name) || name.endsWith('.tmp'))
188
+ continue;
189
+ await rm(avatarFile(name), { force: true });
161
190
  }
162
191
  }
163
192
  function cached(source) {
@@ -166,7 +195,7 @@ export function createAvatarService(options) {
166
195
  return {
167
196
  async answer(source) {
168
197
  if (webUrl(source) === undefined || !admin.isAvatarSource(source)) {
169
- return { kind: 'unknown' };
198
+ return { kind: 'placeholder' };
170
199
  }
171
200
  const held = cached(source);
172
201
  if (held !== undefined)
@@ -190,7 +219,10 @@ export function createAvatarService(options) {
190
219
  if (untilStopped.signal.aborted)
191
220
  untilStopped = new AbortController();
192
221
  void this.sweep();
193
- handle = timers.set(() => void this.sweep(), AVATAR_SWEEP_MS);
222
+ handle = timers.set(() => {
223
+ if (sweeps.pending() === 0)
224
+ void this.sweep();
225
+ }, AVATAR_SWEEP_MS);
194
226
  },
195
227
  stop() {
196
228
  if (handle !== undefined)
@@ -220,13 +252,14 @@ async function fetchAvatar(source, config, signal) {
220
252
  });
221
253
  if (!fetched.ok)
222
254
  return fetched;
255
+ if (!ACCEPTED_SIGNATURES.some((media) => matchesSignature(media, fetched.body))) {
256
+ return { ok: false, reason: 'not a JPEG, PNG, GIF, WebP or AVIF file' };
257
+ }
223
258
  try {
224
- const decoder = sharp(fetched.body, { autoOrient: true, limitInputPixels: MAX_INPUT_PIXELS });
225
- const { format } = await decoder.metadata();
226
- if (format === undefined || !ACCEPTED_FORMATS.has(format)) {
227
- return { ok: false, reason: `a ${String(format)} file, not a picture this site shows` };
228
- }
229
- const image = await decoder
259
+ const image = await sharp(fetched.body, {
260
+ autoOrient: true,
261
+ limitInputPixels: MAX_INPUT_PIXELS,
262
+ })
230
263
  .resize({ width: AVATAR_SIZE, height: AVATAR_SIZE, fit: 'cover', position: 'centre' })
231
264
  .webp({ quality: 80 })
232
265
  .toBuffer();
@@ -1 +1 @@
1
- {"version":3,"file":"avatars.js","sourceRoot":"","sources":["../../src/avatars/avatars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"avatars.js","sourceRoot":"","sources":["../../src/avatars/avatars.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/cms/services.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/cms/services.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,OAAO,KAAK,EAAwB,WAAW,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAExF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAQ9D,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,cAAc,EACf,MAAM,wBAAwB,CAAC;AAKhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAW/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAM7D,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE7F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAWtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAGrF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,KAAK,EAAU,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAGtD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBAAuB,CAAC;AAE3D,mGAAmG;AACnG,eAAO,MAAM,sBAAsB,sBAAsB,CAAC;AAE1D,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAC5C,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,CAAC;CACxC;AAED,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,OAAO,EACP,KAAK,EACL,KAAK,EACL,cAAc,EACd,QAAQ,GACT,EAAE,MAAM,GAAG,QAAQ,CA6dnB"}
@@ -41,6 +41,7 @@ import { createConversation, createRedirectSource, createRenderer, createSiteDat
41
41
  import { pageSources } from '../web/page-sources.js';
42
42
  import { createReplyContextService, createWebmentionService, followMovedWebmentions, } from '../webmention/index.js';
43
43
  import { heldReplyContext } from '../webmention/reply-context.js';
44
+ import { heldFeed } from '../web/conversation-feed.js';
44
45
  import { siteRecords } from './site-records.js';
45
46
  /**
46
47
  * Where the scheduler's watermark lives in {@link AdminStore.getState}: the
@@ -108,7 +109,15 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
108
109
  settings,
109
110
  at: (target, site) => {
110
111
  const found = conversation.heldAt(target, site);
111
- return found === undefined ? undefined : heldReplyContext(target, found);
112
+ if (found === undefined)
113
+ return undefined;
114
+ const storedOnlyNoHeldRecursion = (url) => replyContexts.stored(url);
115
+ const feeds = {
116
+ title: site.title,
117
+ baseUrl: resolved.baseUrl,
118
+ cited: storedOnlyNoHeldRecursion,
119
+ };
120
+ return heldReplyContext(target, found, heldFeed(found, feeds));
112
121
  },
113
122
  },
114
123
  onStored: (target, previous) => {
@@ -150,6 +159,8 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
150
159
  fonts: createPageFonts({
151
160
  store: fonts,
152
161
  refetch: (family, styles) => queueFontFetch(jobs, family, styles),
162
+ jobStatus: (id) => jobs.status(id),
163
+ now: resolved.now,
153
164
  }),
154
165
  // The stored context of a reply's target: a file read, never a fetch, so
155
166
  // a page is drawn without waiting on anybody's server.