From 92f6fe914fce3838fa9ad12333f72e5db5535518 Mon Sep 17 00:00:00 2001 From: Raicuparta Date: Thu, 29 Jun 2023 04:12:16 +0100 Subject: [PATCH 01/16] Search only communities by default when coming from communities page --- src/shared/components/community/communities.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/community/communities.tsx b/src/shared/components/community/communities.tsx index a84ec05..30a4280 100644 --- a/src/shared/components/community/communities.tsx +++ b/src/shared/components/community/communities.tsx @@ -284,7 +284,7 @@ export class Communities extends Component { handleSearchSubmit(i: Communities, event: any) { event.preventDefault(); const searchParamEncoded = encodeURIComponent(i.state.searchText); - i.context.router.history.push(`/search?q=${searchParamEncoded}`); + i.context.router.history.push(`/search?q=${searchParamEncoded}&type=Communities`); } static async fetchInitialData({ From 75c2e803c9c17fb5b8ae72aea80616c1903cfb89 Mon Sep 17 00:00:00 2001 From: Raicuparta Date: Thu, 29 Jun 2023 13:12:30 +0200 Subject: [PATCH 02/16] fix formatting --- src/shared/components/community/communities.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/components/community/communities.tsx b/src/shared/components/community/communities.tsx index 30a4280..8d86d9d 100644 --- a/src/shared/components/community/communities.tsx +++ b/src/shared/components/community/communities.tsx @@ -284,7 +284,9 @@ export class Communities extends Component { handleSearchSubmit(i: Communities, event: any) { event.preventDefault(); const searchParamEncoded = encodeURIComponent(i.state.searchText); - i.context.router.history.push(`/search?q=${searchParamEncoded}&type=Communities`); + i.context.router.history.push( + `/search?q=${searchParamEncoded}&type=Communities` + ); } static async fetchInitialData({ From 005135d4f264d0c0faf821b7888a8f40f9356f9e Mon Sep 17 00:00:00 2001 From: SleeplessOne1917 Date: Thu, 29 Jun 2023 07:20:45 -0400 Subject: [PATCH 03/16] Allow audio captcha through CSP (#1690) Co-authored-by: Dessalines --- src/server/middleware.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/middleware.ts b/src/server/middleware.ts index a7cc6f2..9815e71 100644 --- a/src/server/middleware.ts +++ b/src/server/middleware.ts @@ -10,7 +10,7 @@ export function setDefaultCsp({ }) { res.setHeader( "Content-Security-Policy", - `default-src 'self'; manifest-src *; connect-src *; img-src * data:; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; frame-src *; media-src *` + `default-src 'self'; manifest-src *; connect-src *; img-src * data:; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; frame-src *; media-src * data:` ); next(); @@ -30,7 +30,7 @@ export function setCacheControl({ next: NextFunction; }) { const user = UserService.Instance; - let caching; + let caching: string; if (user.auth()) { caching = "private"; } else { From eee1f443a873135a57953fd20b5624bd6cc65d50 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 29 Jun 2023 08:59:54 -0400 Subject: [PATCH 04/16] Removing unecessary timezone adjusting --- package.json | 14 +++----------- src/shared/components/common/moment-time.tsx | 5 ++--- yarn.lock | 5 ----- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index ef07b29..16d3aec 100644 --- a/package.json +++ b/package.json @@ -22,16 +22,9 @@ "translations:update": "git submodule update --remote --recursive" }, "lint-staged": { - "*.{ts,tsx,js}": [ - "prettier --write", - "eslint --fix" - ], - "*.{css, scss}": [ - "prettier --write" - ], - "package.json": [ - "sortpack" - ] + "*.{ts,tsx,js}": ["prettier --write", "eslint --fix"], + "*.{css, scss}": ["prettier --write"], + "package.json": ["sortpack"] }, "dependencies": { "@babel/plugin-proposal-decorators": "^7.21.0", @@ -52,7 +45,6 @@ "cross-fetch": "^3.1.5", "css-loader": "^6.7.3", "date-fns": "^2.30.0", - "date-fns-tz": "^2.0.0", "emoji-mart": "^5.4.0", "emoji-short-name": "^2.0.0", "express": "~4.18.2", diff --git a/src/shared/components/common/moment-time.tsx b/src/shared/components/common/moment-time.tsx index 24bd3c7..e658695 100644 --- a/src/shared/components/common/moment-time.tsx +++ b/src/shared/components/common/moment-time.tsx @@ -1,5 +1,5 @@ import { capitalizeFirstLetter, formatPastDate } from "@utils/helpers"; -import { formatInTimeZone } from "date-fns-tz"; +import { format } from "date-fns"; import parseISO from "date-fns/parseISO"; import { Component } from "inferno"; import { I18NextService } from "../../services"; @@ -13,9 +13,8 @@ interface MomentTimeProps { } function formatDate(input: string) { - const tz = Intl.DateTimeFormat().resolvedOptions().timeZone; const parsed = parseISO(input + "Z"); - return formatInTimeZone(parsed, tz, "PPPPpppp"); + return format(parsed, "PPPPpppp"); } export class MomentTime extends Component { diff --git a/yarn.lock b/yarn.lock index 57cde87..46fcba1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3237,11 +3237,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -date-fns-tz@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-2.0.0.tgz#1b14c386cb8bc16fc56fe333d4fc34ae1d1099d5" - integrity sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ== - date-fns@^2.30.0: version "2.30.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" From ec649d1911c3a5ee147db052468585931e77b865 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 29 Jun 2023 09:04:09 -0400 Subject: [PATCH 05/16] Fixing site setup. Fixes #1694 (#1697) --- src/shared/components/home/setup.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/shared/components/home/setup.tsx b/src/shared/components/home/setup.tsx index bed1262..966e6d4 100644 --- a/src/shared/components/home/setup.tsx +++ b/src/shared/components/home/setup.tsx @@ -205,9 +205,7 @@ export class Setup extends Component { const data = i.state.registerRes.data; UserService.Instance.login(data); - if (UserService.Instance.jwtInfo) { - i.setState({ doneRegisteringUser: true }); - } + i.setState({ doneRegisteringUser: true }); } } } From 73be96880a28376bf01aca5bc373dbb727e9f322 Mon Sep 17 00:00:00 2001 From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:34:47 -0400 Subject: [PATCH 06/16] fix issue with thumbnails (#1695) --- src/shared/components/post/post-listing.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index ae6e2f3..586403b 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -333,7 +333,7 @@ export class PostListing extends Component { return (