Merge branch 'release' into beta

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Experimental
 
+## [1.130.0] - 2024-04-26
+### Added
+- Support for symmetric bans: comments of users, who have banned the viewer, are
+  hidden for the viewer.
+
 ## [1.129.3] - 2024-04-12
 ### Changed
 - Use blurred low-res preview of NSFW images instead of solid gray panels.

package.json

@@ -7,7 +7,7 @@
     "@fortawesome/free-brands-svg-icons": "~5.15.4",
     "@fortawesome/free-regular-svg-icons": "~5.15.4",
     "@fortawesome/free-solid-svg-icons": "~5.15.4",
-    "@sentry/react": "~7.109.0",
+    "@sentry/react": "~7.112.2",
     "autotrack": "~2.4.1",
     "classnames": "~2.5.1",
     "custom-event": "~1.0.1",
@@ -22,33 +22,33 @@
     "keycode-js": "~3.1.0",
     "local-storage-fallback": "~4.1.2",
     "lodash-es": "~4.17.21",
-    "lru-cache": "~10.2.0",
+    "lru-cache": "~10.2.1",
     "memoize-one": "~6.0.0",
     "mousetrap": "~1.6.5",
     "photoswipe": "~5.4.3",
     "porter-stemmer": "~0.9.1",
     "prop-types": "~15.8.1",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
+    "react": "~18.3.0",
+    "react-dom": "~18.3.0",
     "react-final-form-hooks": "~2.0.2",
     "react-google-recaptcha": "~3.1.0",
     "react-helmet": "~6.1.0",
     "react-portal": "~4.2.2",
-    "react-redux": "~9.1.0",
+    "react-redux": "~9.1.1",
     "react-router": "~3.2.6",
     "react-router-redux": "~4.0.8",
     "react-select": "~5.8.0",
     "react-sortablejs": "~6.1.4",
     "react-textarea-autosize": "~8.5.3",
-    "recharts": "~2.12.4",
+    "recharts": "~2.12.6",
     "redux": "~5.0.1",
     "snarkdown": "~2.0.0",
     "social-text-tokenizer": "~3.0.0",
     "socket.io-client": "~2.3.1",
     "sortablejs": "~1.15.2",
     "tabbable": "~6.2.0",
     "ua-parser-js": "~1.0.37",
-    "use-subscription": "~1.8.0",
+    "use-subscription": "~1.8.1",
     "validator": "~13.11.0",
     "vazirmatn": "^33.0.3",
     "whatwg-fetch": "~3.6.20"
@@ -59,7 +59,7 @@
     "@babel/preset-react": "~7.24.1",
     "@gfx/zopfli": "~1.0.15",
     "@testing-library/jest-dom": "~6.4.2",
-    "@testing-library/react": "~14.3.0",
+    "@testing-library/react": "~14.3.1",
     "@testing-library/react-hooks": "~8.0.1",
     "@testing-library/user-event": "~14.5.2",
     "@vitejs/plugin-legacy": "~5.3.2",
@@ -74,7 +74,7 @@
     "eslint-plugin-prettier": "~5.1.3",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "~7.34.1",
-    "eslint-plugin-react-hooks": "~4.6.0",
+    "eslint-plugin-react-hooks": "~4.6.1",
     "eslint-plugin-unicorn": "~50.0.1",
     "eslint-plugin-you-dont-need-lodash-underscore": "~6.14.0",
     "husky": "~8.0.3",
@@ -84,24 +84,24 @@
     "npm-run-all": "~4.1.5",
     "prettier": "~3.2.5",
     "querystring": "~0.2.1",
-    "react-test-renderer": "~18.2.0",
+    "react-test-renderer": "~18.3.0",
     "rimraf": "~5.0.5",
-    "sass": "^1.74.1",
+    "sass": "^1.75.0",
     "sinon": "~17.0.1",
-    "stylelint": "~16.3.1",
+    "stylelint": "~16.4.0",
     "stylelint-config-prettier": "~9.0.5",
     "stylelint-config-standard-scss": "~13.1.0",
     "stylelint-prettier": "~5.0.0",
     "stylelint-scss": "~6.2.1",
-    "terser": "~5.30.3",
+    "terser": "~5.30.4",
     "unexpected": "~13.2.1",
     "unexpected-react": "~6.0.2",
     "unexpected-sinon": "~11.1.0",
     "url": "~0.11.3",
-    "vite": "~5.2.8",
+    "vite": "~5.2.10",
     "vite-plugin-compression": "~0.5.1",
     "vite-plugin-generate-file": "~0.1.1",
-    "vitest": "~1.4.0"
+    "vitest": "~1.5.2"
   },
   "scripts": {
     "start": "vite",

src/components/footer.jsx

@@ -7,7 +7,7 @@ export default function Footer({ short }) {
   return (
     <footer className="footer">
       <p role="navigation">
-        &copy; FreeFeed 1.129.3-beta (Apr 12, 2024)
+        &copy; FreeFeed 1.130.0-beta (Apr 26, 2024)
         <br />
         <Link to="/about">About</Link>
         {' | '}

src/components/post/post-comment-preview.jsx

@@ -153,7 +153,7 @@ export function PostCommentPreview({
     >
       {comment ? (
         <CommentProvider id={comment.id}>
-          {comment.hideType || comment._hideType ? (
+          {comment.hideType ? (
             <span className={styles['hidden-text']}>{commentBody}</span>
           ) : (
             <Expandable

src/components/post/post-comment.jsx

@@ -5,11 +5,7 @@ import classnames from 'classnames';
 import { connect } from 'react-redux';
 
 import { preventDefault, confirmFirst } from '../../utils';
-import {
-  READMORE_STYLE_COMPACT,
-  HIDDEN_AUTHOR_BANNED,
-  HIDDEN_VIEWER_BANNED,
-} from '../../utils/frontend-preferences-options';
+import { READMORE_STYLE_COMPACT } from '../../utils/frontend-preferences-options';
 import { commentReadmoreConfig } from '../../utils/readmore-config';
 import { defaultCommentState } from '../../redux/reducers/comment-edit';
 
@@ -96,16 +92,10 @@ class PostComment extends Component {
   };
 
   isHidden() {
-    return !!this.props.hideType || !!this.props._hideType || this.props.isReplyToBanned;
+    return !!this.props.hideType || this.props.isReplyToBanned;
   }
 
   hiddenBody() {
-    if (this.props.hideType === HIDDEN_AUTHOR_BANNED) {
-      return 'Comment from blocked user';
-    }
-    if (this.props._hideType === HIDDEN_VIEWER_BANNED) {
-      return 'Comment from user who blocked you';
-    }
     if (this.props.isReplyToBanned) {
       return 'Comment with reply to blocked user';
     }