Skip to content

Commit 1edbe99

Browse files
authored
Merge pull request #212 from anatawa12/vmimi-relay-timeline/merge-2025.2.1
Merge 2025.2.1
2 parents 4c4b5d8 + af8de5e commit 1edbe99

File tree

460 files changed

+9600
-7699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

460 files changed

+9600
-7699
lines changed

.config/cypress-devcontainer.yml

+5
Original file line numberDiff line numberDiff line change
@@ -220,5 +220,10 @@ allowedPrivateNetworks: [
220220
'127.0.0.1/32'
221221
]
222222

223+
# Disable automatic redirect for ActivityPub object lookup. (default: false)
224+
# This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation.
225+
# However it will make it impossible for other instances to lookup third-party user and notes through your URL.
226+
#disallowExternalApRedirect: true
227+
223228
# Upload or download file size limits (bytes)
224229
#maxFileSize: 262144000

.config/docker_example.yml

+5
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,11 @@ signToActivityPubGet: true
235235
# '127.0.0.1/32'
236236
#]
237237

238+
# Disable automatic redirect for ActivityPub object lookup. (default: false)
239+
# This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation.
240+
# However it will make it impossible for other instances to lookup third-party user and notes through your URL.
241+
#disallowExternalApRedirect: true
242+
238243
# Upload or download file size limits (bytes)
239244
#maxFileSize: 262144000
240245

.config/example.yml

+5
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,11 @@ signToActivityPubGet: true
334334
# '127.0.0.1/32'
335335
#]
336336

337+
# Disable automatic redirect for ActivityPub object lookup. (default: false)
338+
# This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation.
339+
# However it will make it impossible for other instances to lookup third-party user and notes through your URL.
340+
#disallowExternalApRedirect: true
341+
337342
# Upload or download file size limits (bytes)
338343
#maxFileSize: 262144000
339344

.devcontainer/devcontainer.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"ghcr.io/devcontainers/features/node:1": {
88
"version": "22.11.0"
99
},
10-
"ghcr.io/devcontainers-contrib/features/corepack:1": {}
10+
"ghcr.io/devcontainers-extra/features/corepack:1": {
11+
"version": "0.31.0"
12+
}
1113
},
1214
"forwardPorts": [3000],
1315
"postCreateCommand": "/bin/bash .devcontainer/init.sh",

.github/dependabot.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ updates:
99
directory: "/"
1010
schedule:
1111
interval: daily
12-
open-pull-requests-limit: 100
12+
open-pull-requests-limit: 0
1313

1414
# Add only the root, not each workspace item
1515
# https://github.com/dependabot/dependabot-core/issues/4993#issuecomment-1289133027
1616
- package-ecosystem: npm
1717
directory: "/"
1818
schedule:
1919
interval: daily
20-
open-pull-requests-limit: 10
20+
open-pull-requests-limit: 0
2121
# List dependencies required to be updated together, sharing the same version numbers.
2222
# Those who simply have the common owner (e.g. @fastify) don't need to be listed.
2323
groups:

.github/workflows/api-misskey-js.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4.1.1
23+
uses: actions/checkout@v4.2.2
2424

2525
- run: corepack enable
2626

2727
- name: Setup Node.js
28-
uses: actions/setup-node@v4.1.0
28+
uses: actions/setup-node@v4.2.0
2929
with:
3030
node-version-file: '.node-version'
3131
cache: 'pnpm'

.github/workflows/changelog-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212

1313
steps:
1414
- name: Checkout head
15-
uses: actions/checkout@v4.1.1
15+
uses: actions/checkout@v4.2.2
1616
- name: Setup Node.js
17-
uses: actions/setup-node@v4.1.0
17+
uses: actions/setup-node@v4.2.0
1818
with:
1919
node-version-file: '.node-version'
2020

.github/workflows/check-misskey-js-autogen.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
1919
steps:
2020
- name: checkout
21-
uses: actions/checkout@v4.1.1
21+
uses: actions/checkout@v4.2.2
2222
with:
2323
submodules: true
2424
persist-credentials: false
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: setup node
3131
id: setup-node
32-
uses: actions/setup-node@v4.1.0
32+
uses: actions/setup-node@v4.2.0
3333
with:
3434
node-version-file: '.node-version'
3535
cache: pnpm
@@ -66,7 +66,7 @@ jobs:
6666
if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
6767
steps:
6868
- name: checkout
69-
uses: actions/checkout@v4.1.1
69+
uses: actions/checkout@v4.2.2
7070
with:
7171
submodules: true
7272
persist-credentials: false

.github/workflows/check-misskey-js-version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4.1.1
23+
uses: actions/checkout@v4.2.2
2424
- name: Check version
2525
run: |
2626
if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then

.github/workflows/check-spdx-license-id.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4.1.1
15+
uses: actions/checkout@v4.2.2
1616
- name: Check
1717
run: |
1818
counter=0

.github/workflows/check_copyright_year.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check_copyright_year:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4.1.1
13+
- uses: actions/checkout@v4.2.2
1414
- run: |
1515
if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
1616
echo "Please change copyright year!"

.github/workflows/deploy-test-environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
wait_time: ${{ steps.get-wait-time.outputs.wait_time }}
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v4.1.1
31+
uses: actions/checkout@v4.2.2
3232

3333
- name: Check allowed users
3434
id: check-allowed-users

.github/workflows/docker-develop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
platform=${{ matrix.platform }}
2828
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
2929
- name: Check out the repo
30-
uses: actions/checkout@v4.1.1
30+
uses: actions/checkout@v4.2.2
3131
- name: Set up Docker Buildx
3232
uses: docker/setup-buildx-action@v3
3333
- name: Log in to Docker Hub

.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
platform=${{ matrix.platform }}
3333
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
3434
- name: Check out the repo
35-
uses: actions/checkout@v4.1.1
35+
uses: actions/checkout@v4.2.2
3636
- name: Set up Docker Buildx
3737
uses: docker/setup-buildx-action@v3
3838
- name: Docker meta

.github/workflows/dockle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
DOCKER_CONTENT_TRUST: 1
1616
DOCKLE_VERSION: 0.4.14
1717
steps:
18-
- uses: actions/checkout@v4.1.1
18+
- uses: actions/checkout@v4.2.2
1919
- name: Download and install dockle v${{ env.DOCKLE_VERSION }}
2020
run: |
2121
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"

.github/workflows/get-api-diff.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
ref: refs/pull/${{ github.event.number }}/merge
3131

3232
steps:
33-
- uses: actions/checkout@v4.1.1
33+
- uses: actions/checkout@v4.2.2
3434
with:
3535
ref: ${{ matrix.ref }}
3636
submodules: true
3737
- name: Install pnpm
3838
uses: pnpm/action-setup@v4
3939
- name: Use Node.js ${{ matrix.node-version }}
40-
uses: actions/setup-node@v4.1.0
40+
uses: actions/setup-node@v4.2.0
4141
with:
4242
node-version: ${{ matrix.node-version }}
4343
cache: 'pnpm'

.github/workflows/lint.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
pnpm_install:
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v4.1.1
39+
- uses: actions/checkout@v4.2.2
4040
with:
4141
fetch-depth: 0
4242
submodules: true
4343
- uses: pnpm/action-setup@v4
44-
- uses: actions/setup-node@v4.1.0
44+
- uses: actions/setup-node@v4.2.0
4545
with:
4646
node-version-file: '.node-version'
4747
cache: 'pnpm'
@@ -67,19 +67,19 @@ jobs:
6767
eslint-cache-version: v1
6868
eslint-cache-path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
6969
steps:
70-
- uses: actions/checkout@v4.1.1
70+
- uses: actions/checkout@v4.2.2
7171
with:
7272
fetch-depth: 0
7373
submodules: true
7474
- uses: pnpm/action-setup@v4
75-
- uses: actions/setup-node@v4.1.0
75+
- uses: actions/setup-node@v4.2.0
7676
with:
7777
node-version-file: '.node-version'
7878
cache: 'pnpm'
7979
- run: corepack enable
8080
- run: pnpm i --frozen-lockfile
8181
- name: Restore eslint cache
82-
uses: actions/cache@v4.2.0
82+
uses: actions/cache@v4.2.1
8383
with:
8484
path: ${{ env.eslint-cache-path }}
8585
key: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
@@ -97,12 +97,12 @@ jobs:
9797
- sw
9898
- misskey-js
9999
steps:
100-
- uses: actions/checkout@v4.1.1
100+
- uses: actions/checkout@v4.2.2
101101
with:
102102
fetch-depth: 0
103103
submodules: true
104104
- uses: pnpm/action-setup@v4
105-
- uses: actions/setup-node@v4.1.0
105+
- uses: actions/setup-node@v4.2.0
106106
with:
107107
node-version-file: '.node-version'
108108
cache: 'pnpm'

.github/workflows/locale.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
runs-on: ubuntu-latest
1919
continue-on-error: true
2020
steps:
21-
- uses: actions/checkout@v4.1.1
21+
- uses: actions/checkout@v4.2.2
2222
with:
2323
fetch-depth: 0
2424
submodules: true
2525
- uses: pnpm/action-setup@v4
26-
- uses: actions/setup-node@v4.1.0
26+
- uses: actions/setup-node@v4.2.0
2727
with:
2828
node-version-file: '.node-version'
2929
cache: 'pnpm'

.github/workflows/ok-to-test.yml

-36
This file was deleted.

.github/workflows/on-release-created.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
node-version: [22.11.0]
2424

2525
steps:
26-
- uses: actions/checkout@v4.1.1
26+
- uses: actions/checkout@v4.2.2
2727
with:
2828
submodules: true
2929
- name: Install pnpm
3030
uses: pnpm/action-setup@v4
3131
- name: Use Node.js ${{ matrix.node-version }}
32-
uses: actions/setup-node@v4.1.0
32+
uses: actions/setup-node@v4.2.0
3333
with:
3434
node-version: ${{ matrix.node-version }}
3535
cache: 'pnpm'

0 commit comments

Comments
 (0)