Merge 558f54cab2 into 8b34daf254

Fix: Use strings not symbols to access totalItems in interaction collections (#34594 )
Merge branch 'main' into patch-1
2025-05-07 20:26:15 +00:00 · 2025-05-03 11:04:44 +00:00 · 2025-05-03 10:37:06 +00:00 · 2025-04-19 21:16:44 -07:00 · 2025-04-10 23:31:16 -07:00 · 2025-04-09 19:13:42 -07:00
6 changed files with 7 additions and 7 deletions
--- a/.github/actions/setup-javascript/action.yml
+++ b/.github/actions/setup-javascript/action.yml
@ -16,7 +16,7 @@ runs:
    # The following is needed because we can not use `cache: true` for `setup-node`, as it does not support Corepack yet and mess up with the cache location if ran after Node is installed
    - name: Enable corepack
      shell: bash
-      run: corepack enable
+      run: npm i -g corepack

    - name: Get yarn cache directory path
      id: yarn-cache-dir-path
--- a/2
+++ b/2
@ -286,7 +286,7 @@ COPY --from=node /usr/local/lib /usr/local/lib
 RUN \
  # Configure Corepack
  rm /usr/local/bin/yarn*; \
-  corepack enable; \
+  npm i -g corepack; \
  corepack prepare --activate;

 # hadolint ignore=DL3008
--- a/2
+++ b/2
@ -115,7 +115,7 @@ gem install bundler foreman
 bundle install

 # Install node modules
-sudo corepack enable
+sudo npm i -g corepack
 corepack prepare
 yarn install

--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@ -95,11 +95,11 @@ class ActivityPub::Parser::StatusParser
  end

  def favourites_count
-    @object.dig(:likes, :totalItems)
+    @object.dig('likes', 'totalItems')
  end

  def reblogs_count
-    @object.dig(:shares, :totalItems)
+    @object.dig('shares', 'totalItems')
  end

  def quote_policy
--- a/bin/setup
+++ b/bin/setup
@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
  system('bundle check') || system!('bundle install')

  puts "\n== Installing JS dependencies =="
-  system! 'corepack enable'
+  system! 'npm i -g corepack'
  system! 'bin/yarn install --immutable'

  puts "\n== Preparing database =="
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@ -96,7 +96,7 @@ RUN \
 --mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \
  # Configure Corepack
  rm /usr/local/bin/yarn*; \
-  corepack enable; \
+  npm i -g corepack; \
  corepack prepare --activate;

 RUN \
Author	SHA1	Message	Date
Trivikram Kamat	c894114a39	Merge `558f54cab2` into `8b34daf254`	2025-05-03 11:04:44 +00:00
Jonny Saunders	8b34daf254	Fix: Use strings not symbols to access `totalItems` in interaction collections (#34594 ) Some checks failed Check i18n / check-i18n (push) Has been cancelled Details CodeQL / Analyze (javascript) (push) Has been cancelled Details CodeQL / Analyze (ruby) (push) Has been cancelled Details Check formatting / lint (push) Has been cancelled Details Ruby Linting / lint (push) Has been cancelled Details Historical data migration test / test (14-alpine) (push) Has been cancelled Details Historical data migration test / test (15-alpine) (push) Has been cancelled Details Historical data migration test / test (16-alpine) (push) Has been cancelled Details Historical data migration test / test (17-alpine) (push) Has been cancelled Details Ruby Testing / build (production) (push) Has been cancelled Details Ruby Testing / build (test) (push) Has been cancelled Details Ruby Testing / test (.ruby-version) (push) Has been cancelled Details Ruby Testing / test (3.2) (push) Has been cancelled Details Ruby Testing / test (3.3) (push) Has been cancelled Details Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled Details Ruby Testing / Libvips tests (3.2) (push) Has been cancelled Details Ruby Testing / Libvips tests (3.3) (push) Has been cancelled Details Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled Details Ruby Testing / End to End testing (3.2) (push) Has been cancelled Details Ruby Testing / End to End testing (3.3) (push) Has been cancelled Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled Details Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled Details Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled Details Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled Details Bundler Audit / security (push) Has been cancelled Details	2025-05-03 10:37:06 +00:00
Trivikram Kamat	558f54cab2	Merge branch 'main' into patch-1	2025-04-19 21:16:44 -07:00
Trivikram Kamat	838b5ffcfb	Merge branch 'main' into patch-1	2025-04-10 23:31:16 -07:00
Trivikram Kamat	ca7e5578f2	Globally install corepack	2025-04-09 19:13:42 -07:00