Merge remote-tracking branch 'philo/1_2_stable'

Author: Meow

.dialyzer_ignore.exs

@@ -0,0 +1,24 @@
+[
+  {"lib/philomena/adverts/restrictions.ex", :call_without_opaque},
+  {"lib/philomena/artist_links.ex", :call_without_opaque},
+  {"lib/philomena/bans.ex", :call_without_opaque},
+  {"lib/philomena/comments.ex", :call_without_opaque},
+  {"lib/philomena/commissions.ex", :call_without_opaque},
+  {"lib/philomena/conversations.ex", :call_without_opaque},
+  {"lib/philomena/duplicate_reports.ex", :call_without_opaque},
+  {"lib/philomena/galleries.ex", :call_without_opaque},
+  {"lib/philomena/image_faves.ex", :call_without_opaque},
+  {"lib/philomena/image_hides.ex", :call_without_opaque},
+  {"lib/philomena/image_votes.ex", :call_without_opaque},
+  {"lib/philomena/images.ex", :call_without_opaque},
+  {"lib/philomena/images/tag_validator.ex", :call_without_opaque},
+  {"lib/philomena/interactions.ex", :call_without_opaque},
+  {"lib/philomena/poll_votes.ex", :call_without_opaque},
+  {"lib/philomena/posts.ex", :call_without_opaque},
+  {"lib/philomena/static_pages.ex", :call_without_opaque},
+  {"lib/philomena/tags.ex", :call_without_opaque},
+  {"lib/philomena/topics.ex", :call_without_opaque},
+  {"lib/philomena/users.ex", :call_without_opaque},
+  {"lib/philomena/users/user.ex", :call_without_opaque},
+  {"lib/philomena_web/plugs/content_security_policy_plug.ex", :call_without_opaque}
+]

.github/workflows/elixir.yml

@@ -45,10 +45,12 @@ jobs:
     name: Rust Linting and Unit Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/[email protected]
+        with:
+          components: clippy, rustfmt
 
       - name: cargo fmt
         run: (cd native/philomena && cargo fmt --check)

.gitignore

@@ -30,6 +30,7 @@ npm-debug.log
 
 # The directory NPM downloads your dependencies sources to.
 /assets/node_modules/
+/node_modules
 
 # Since we are building assets from assets/,
 # we ignore priv/static. You may want to comment
@@ -64,3 +65,6 @@ npm-debug.log
 
 # Vitest coverage
 /assets/coverage
+
+# OS junk
+.DS_Store

assets/js/__tests__/tagsinput.spec.ts

@@ -166,7 +166,7 @@ describe('Fancy tags input', () => {
   it('adds new tag when comma is pressed', () => {
     setupTagsInput(tagBlock);
 
-    const ev = new KeyboardEvent('keydown', { keyCode: 188, bubbles: true });
+    const ev = new KeyboardEvent('keydown', { keyCode: 188, key: ',', bubbles: true });
     fancyText.value = 'a';
     fancyText.dispatchEvent(ev);
 

assets/js/image_expansion.js

@@ -44,7 +44,7 @@ function selectVersion(imageWidth, imageHeight, imageSize, imageMime) {
   // Sanity check to make sure we're not serving unintentionally huge assets
   // all at once (where "huge" > 25 MiB). Videos are loaded in chunks so it
   // doesn't matter too much there.
-  if (imageMime === 'video/webm' || imageSize <= 26214400) {
+  if (imageMime === 'video/webm' || imageSize <= 26_214_400) {
     return 'full';
   }
 

assets/js/tagsinput.ts

@@ -71,7 +71,7 @@ export function setupTagsInput(tagBlock: HTMLDivElement) {
   }
 
   function handleKeyEvent(event: KeyboardEvent) {
-    const { ctrlKey, shiftKey } = event;
+    const { ctrlKey } = event;
     const key = normalizedKeyboardKey(event);
 
     // allow form submission with ctrl+enter if no text was typed
@@ -86,7 +86,7 @@ export function setupTagsInput(tagBlock: HTMLDivElement) {
       if (erased) removeTag(tags[tags.length - 1], erased);
     }
 
-    if (key === keys.Enter || (key === keys.Comma && !shiftKey)) {
+    if (key === keys.Enter || key === keys.Comma) {
       event.preventDefault();
       inputField.value.split(',').forEach(t => insertTag(t));
       inputField.value = '';

assets/js/utils/keyboard.ts

@@ -41,13 +41,23 @@ const keysMapping = {
   88: 'KeyX',
   89: 'KeyY',
   90: 'KeyZ',
-  188: 'Comma',
+  // keyCode stays the same in various layouts, but actual value of the key differs
+  // and works in unexpected way
+  // 188: 'Comma',
 } as const;
 
+const literalKeysMapping = {
+  ',': 'Comma',
+} as const;
+
+type keysAsEnum<Obj extends Record<string, string>> = Record<Obj[keyof Obj], string>;
+
 /**
  * A map of known keys to be used in code to avoid typos.
  */
-export const keys = Object.fromEntries(Object.values(keysMapping).map(key => [key, key]));
+export const keys = Object.fromEntries(
+  (Object.values(keysMapping) as string[]).concat(Object.values(literalKeysMapping)).map(key => [key, key]),
+) as keysAsEnum<typeof keysMapping & typeof literalKeysMapping>;
 
 /**
  * There are many inconsistencies in the way different browsers handle keyboard
@@ -58,12 +68,15 @@ export const keys = Object.fromEntries(Object.values(keysMapping).map(key => [ke
  *   pressed via the virtual keyboard.
  * - There seems to be no way to reliably detect the `,` key on virtual
  *   keyboards on phones.
+ * - `,` key also have different placements in different layouts.
  * - The `event.code` uses `NumpadEnter` for the numpad enter key on regular
  *   keyboards
  */
 export function normalizedKeyboardKey(event: KeyboardEvent): string {
+  const literalKey = asRecord(literalKeysMapping)[event.key];
+
   // It is possible that this chain goes all the way to the `event.key` because
   // on mobile phones the `Enter` key has empty `code` for some reason, but it
   // has `Enter` as `key`.
-  return asRecord(keysMapping)[event.keyCode] || event.code || event.key;
+  return literalKey || asRecord(keysMapping)[event.keyCode] || event.code || event.key;
 }