LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-26 06:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into thumbnail_sizes

Browse source
This commit is contained in:
Dessalines 2024-06-17 15:27:28 -04:00
commit aee70a2fd6
5 changed files with 61 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api_tests/package.json
View file

@ -6,7 +6,7 @@
"repository": "https://github.com/LemmyNet/lemmy", "repository": "https://github.com/LemmyNet/lemmy",
"author": "Dessalines", "author": "Dessalines",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"packageManager": "pnpm@9.3.0", "packageManager": "pnpm@9.4.0",
"scripts": { "scripts": {
"lint": "tsc --noEmit && eslint --report-unused-disable-directives && prettier --check 'src/**/*.ts'", "lint": "tsc --noEmit && eslint --report-unused-disable-directives && prettier --check 'src/**/*.ts'",
"fix": "prettier --write src && eslint --fix src", "fix": "prettier --write src && eslint --fix src",

90
api_tests/pnpm-lock.yaml
View file

@ -16,10 +16,10 @@ importers:
version: 20.14.2 version: 20.14.2
'@typescript-eslint/eslint-plugin': '@typescript-eslint/eslint-plugin':
specifier: ^7.5.0 specifier: ^7.5.0
version: 7.13.0(@typescript-eslint/parser@7.13.0(eslint@9.5.0)(typescript@5.4.5))(eslint@9.5.0)(typescript@5.4.5) version: 7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint@9.5.0)(typescript@5.4.5)
'@typescript-eslint/parser': '@typescript-eslint/parser':
specifier: ^7.5.0 specifier: ^7.5.0
version: 7.13.0(eslint@9.5.0)(typescript@5.4.5) version: 7.13.1(eslint@9.5.0)(typescript@5.4.5)
download-file-sync: download-file-sync:
specifier: ^1.0.4 specifier: ^1.0.4
version: 1.0.4 version: 1.0.4
@ -419,8 +419,8 @@ packages:
'@types/yargs@17.0.32': '@types/yargs@17.0.32':
resolution: {integrity: sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==} resolution: {integrity: sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==}
'@typescript-eslint/eslint-plugin@7.13.0': '@typescript-eslint/eslint-plugin@7.13.1':
resolution: {integrity: sha512-FX1X6AF0w8MdVFLSdqwqN/me2hyhuQg4ykN6ZpVhh1ij/80pTvDKclX1sZB9iqex8SjQfVhwMKs3JtnnMLzG9w==} resolution: {integrity: sha512-kZqi+WZQaZfPKnsflLJQCz6Ze9FFSMfXrrIOcyargekQxG37ES7DJNpJUE9Q/X5n3yTIP/WPutVNzgknQ7biLg==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies: peerDependencies:
'@typescript-eslint/parser': ^7.0.0 '@typescript-eslint/parser': ^7.0.0
@ -430,8 +430,8 @@ packages:
typescript: typescript:
optional: true optional: true
'@typescript-eslint/parser@7.13.0': '@typescript-eslint/parser@7.13.1':
resolution: {integrity: sha512-EjMfl69KOS9awXXe83iRN7oIEXy9yYdqWfqdrFAYAAr6syP8eLEFI7ZE4939antx2mNgPRW/o1ybm2SFYkbTVA==} resolution: {integrity: sha512-1ELDPlnLvDQ5ybTSrMhRTFDfOQEOXNM+eP+3HT/Yq7ruWpciQw+Avi73pdEbA4SooCawEWo3dtYbF68gN7Ed1A==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies: peerDependencies:
eslint: ^8.56.0 eslint: ^8.56.0
@ -440,12 +440,12 @@ packages:
typescript: typescript:
optional: true optional: true
'@typescript-eslint/scope-manager@7.13.0': '@typescript-eslint/scope-manager@7.13.1':
resolution: {integrity: sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==} resolution: {integrity: sha512-adbXNVEs6GmbzaCpymHQ0MB6E4TqoiVbC0iqG3uijR8ZYfpAXMGttouQzF4Oat3P2GxDVIrg7bMI/P65LiQZdg==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
'@typescript-eslint/type-utils@7.13.0': '@typescript-eslint/type-utils@7.13.1':
resolution: {integrity: sha512-xMEtMzxq9eRkZy48XuxlBFzpVMDurUAfDu5Rz16GouAtXm0TaAoTFzqWUFPPuQYXI/CDaH/Bgx/fk/84t/Bc9A==} resolution: {integrity: sha512-aWDbLu1s9bmgPGXSzNCxELu+0+HQOapV/y+60gPXafR8e2g1Bifxzevaa+4L2ytCWm+CHqpELq4CSoN9ELiwCg==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies: peerDependencies:
eslint: ^8.56.0 eslint: ^8.56.0
@ -454,12 +454,12 @@ packages:
typescript: typescript:
optional: true optional: true
'@typescript-eslint/types@7.13.0': '@typescript-eslint/types@7.13.1':
resolution: {integrity: sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==} resolution: {integrity: sha512-7K7HMcSQIAND6RBL4kDl24sG/xKM13cA85dc7JnmQXw2cBDngg7c19B++JzvJHRG3zG36n9j1i451GBzRuHchw==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
'@typescript-eslint/typescript-estree@7.13.0': '@typescript-eslint/typescript-estree@7.13.1':
resolution: {integrity: sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==} resolution: {integrity: sha512-uxNr51CMV7npU1BxZzYjoVz9iyjckBduFBP0S5sLlh1tXYzHzgZ3BR9SVsNed+LmwKrmnqN3Kdl5t7eZ5TS1Yw==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies: peerDependencies:
typescript: '*' typescript: '*'
@ -467,14 +467,14 @@ packages:
typescript: typescript:
optional: true optional: true
'@typescript-eslint/utils@7.13.0': '@typescript-eslint/utils@7.13.1':
resolution: {integrity: sha512-jceD8RgdKORVnB4Y6BqasfIkFhl4pajB1wVxrF4akxD2QPM8GNYjgGwEzYS+437ewlqqrg7Dw+6dhdpjMpeBFQ==} resolution: {integrity: sha512-h5MzFBD5a/Gh/fvNdp9pTfqJAbuQC4sCN2WzuXme71lqFJsZtLbjxfSk4r3p02WIArOF9N94pdsLiGutpDbrXQ==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies: peerDependencies:
eslint: ^8.56.0 eslint: ^8.56.0
'@typescript-eslint/visitor-keys@7.13.0': '@typescript-eslint/visitor-keys@7.13.1':
resolution: {integrity: sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==} resolution: {integrity: sha512-k/Bfne7lrP7hcb7m9zSsgcBmo+8eicqqfNAJ7uUY+jkTFpKeH2FSkWpFRtimBxgkyvqfu9jTPRbYOvud6isdXA==}
engines: {node: ^18.18.0 || >=20.0.0} engines: {node: ^18.18.0 || >=20.0.0}
acorn-jsx@5.3.2: acorn-jsx@5.3.2:
@ -2132,14 +2132,14 @@ snapshots:
dependencies: dependencies:
'@types/yargs-parser': 21.0.3 '@types/yargs-parser': 21.0.3
'@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@9.5.0)(typescript@5.4.5))(eslint@9.5.0)(typescript@5.4.5)': '@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint@9.5.0)(typescript@5.4.5)':
dependencies: dependencies:
'@eslint-community/regexpp': 4.10.1 '@eslint-community/regexpp': 4.10.1
'@typescript-eslint/parser': 7.13.0(eslint@9.5.0)(typescript@5.4.5) '@typescript-eslint/parser': 7.13.1(eslint@9.5.0)(typescript@5.4.5)
'@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/scope-manager': 7.13.1
'@typescript-eslint/type-utils': 7.13.0(eslint@9.5.0)(typescript@5.4.5) '@typescript-eslint/type-utils': 7.13.1(eslint@9.5.0)(typescript@5.4.5)
'@typescript-eslint/utils': 7.13.0(eslint@9.5.0)(typescript@5.4.5) '@typescript-eslint/utils': 7.13.1(eslint@9.5.0)(typescript@5.4.5)
'@typescript-eslint/visitor-keys': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.1
eslint: 9.5.0 eslint: 9.5.0
graphemer: 1.4.0 graphemer: 1.4.0
ignore: 5.3.1 ignore: 5.3.1
@ -2150,12 +2150,12 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@typescript-eslint/parser@7.13.0(eslint@9.5.0)(typescript@5.4.5)': '@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5)':
dependencies: dependencies:
'@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/scope-manager': 7.13.1
'@typescript-eslint/types': 7.13.0 '@typescript-eslint/types': 7.13.1
'@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) '@typescript-eslint/typescript-estree': 7.13.1(typescript@5.4.5)
'@typescript-eslint/visitor-keys': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.1
debug: 4.3.5 debug: 4.3.5
eslint: 9.5.0 eslint: 9.5.0
optionalDependencies: optionalDependencies:
@ -2163,15 +2163,15 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@typescript-eslint/scope-manager@7.13.0': '@typescript-eslint/scope-manager@7.13.1':
dependencies: dependencies:
'@typescript-eslint/types': 7.13.0 '@typescript-eslint/types': 7.13.1
'@typescript-eslint/visitor-keys': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.1
'@typescript-eslint/type-utils@7.13.0(eslint@9.5.0)(typescript@5.4.5)': '@typescript-eslint/type-utils@7.13.1(eslint@9.5.0)(typescript@5.4.5)':
dependencies: dependencies:
'@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) '@typescript-eslint/typescript-estree': 7.13.1(typescript@5.4.5)
'@typescript-eslint/utils': 7.13.0(eslint@9.5.0)(typescript@5.4.5) '@typescript-eslint/utils': 7.13.1(eslint@9.5.0)(typescript@5.4.5)
debug: 4.3.5 debug: 4.3.5
eslint: 9.5.0 eslint: 9.5.0
ts-api-utils: 1.3.0(typescript@5.4.5) ts-api-utils: 1.3.0(typescript@5.4.5)
@ -2180,12 +2180,12 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@typescript-eslint/types@7.13.0': {} '@typescript-eslint/types@7.13.1': {}
'@typescript-eslint/typescript-estree@7.13.0(typescript@5.4.5)': '@typescript-eslint/typescript-estree@7.13.1(typescript@5.4.5)':
dependencies: dependencies:
'@typescript-eslint/types': 7.13.0 '@typescript-eslint/types': 7.13.1
'@typescript-eslint/visitor-keys': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.1
debug: 4.3.5 debug: 4.3.5
globby: 11.1.0 globby: 11.1.0
is-glob: 4.0.3 is-glob: 4.0.3
@ -2197,20 +2197,20 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@typescript-eslint/utils@7.13.0(eslint@9.5.0)(typescript@5.4.5)': '@typescript-eslint/utils@7.13.1(eslint@9.5.0)(typescript@5.4.5)':
dependencies: dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@9.5.0) '@eslint-community/eslint-utils': 4.4.0(eslint@9.5.0)
'@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/scope-manager': 7.13.1
'@typescript-eslint/types': 7.13.0 '@typescript-eslint/types': 7.13.1
'@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) '@typescript-eslint/typescript-estree': 7.13.1(typescript@5.4.5)
eslint: 9.5.0 eslint: 9.5.0
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
- typescript - typescript
'@typescript-eslint/visitor-keys@7.13.0': '@typescript-eslint/visitor-keys@7.13.1':
dependencies: dependencies:
'@typescript-eslint/types': 7.13.0 '@typescript-eslint/types': 7.13.1
eslint-visitor-keys: 3.4.3 eslint-visitor-keys: 3.4.3
acorn-jsx@5.3.2(acorn@8.11.3): acorn-jsx@5.3.2(acorn@8.11.3):

2
crates/db_schema/replaceable_schema/triggers.sql
View file

@ -486,7 +486,7 @@ BEGIN
INNER JOIN old_post ON old_post.id = new_post.id INNER JOIN old_post ON old_post.id = new_post.id
AND (old_post.featured_community, AND (old_post.featured_community,
old_post.featured_local) != (new_post.featured_community, old_post.featured_local) != (new_post.featured_community,
old_post.featured_local) new_post.featured_local)
WHERE WHERE
post_aggregates.post_id = new_post.id; post_aggregates.post_id = new_post.id;
RETURN NULL; RETURN NULL;

3
migrations/2024-06-17-160323_fix_post_aggregates_featured_local/down.sql Normal file
View file

@ -0,0 +1,3 @@
SELECT
;

11
migrations/2024-06-17-160323_fix_post_aggregates_featured_local/up.sql Normal file
View file

@ -0,0 +1,11 @@
-- Fix rows that were not updated because of the old incorrect trigger
UPDATE
post_aggregates
SET
featured_local = post.featured_local
FROM
post
WHERE
post.id = post_aggregates.post_id
AND post.featured_local != post_aggregates.featured_local;