mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
02851848e9
* Add model for custom filter keywords * Use CustomFilterKeyword internally Does not change the API * Fix /filters/edit and /filters/new * Add migration tests * Remove whole_word column from custom_filters (covered by custom_filter_keywords) * Redesign /filters Instead of a list, present a card that displays more information and handles multiple keywords per filter. * Redesign /filters/new and /filters/edit to add and remove keywords This adds a new gem dependency: cocoon, as well as a npm dependency: cocoon-js-vanilla. Those are used to easily populate and remove form fields from the user interface when manipulating multiple keyword filters at once. * Add /api/v2/filters to edit filter with multiple keywords Entities: - `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context` `keywords` - `FilterKeyword`: `id`, `keyword`, `whole_word` API endpoits: - `GET /api/v2/filters` to list filters (including keywords) - `POST /api/v2/filters` to create a new filter `keywords_attributes` can also be passed to create keywords in one request - `GET /api/v2/filters/:id` to read a particular filter - `PUT /api/v2/filters/:id` to update a new filter `keywords_attributes` can also be passed to edit, delete or add keywords in one request - `DELETE /api/v2/filters/:id` to delete a particular filter - `GET /api/v2/filters/:id/keywords` to list keywords for a filter - `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a filter - `GET /api/v2/filter_keywords/:id` to read a particular keyword - `PUT /api/v2/filter_keywords/:id` to edit a particular keyword - `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword * Change from `irreversible` boolean to `action` enum * Remove irrelevent `irreversible_must_be_within_context` check * Fix /filters/new and /filters/edit with update for filter_action * Fix Rubocop/Codeclimate complaining about task names * Refactor FeedManager#phrase_filtered? This moves regexp building and filter caching to the `CustomFilter` class. This does not change the functional behavior yet, but this changes how the cache is built, doing per-custom_filter regexps so that filters can be matched independently, while still offering caching. * Perform server-side filtering and output result in REST API * Fix numerous filters_changed events being sent when editing multiple keywords at once * Add some tests * Use the new API in the WebUI - use client-side logic for filters we have fetched rules for. This is so that filter changes can be retroactively applied without reloading the UI. - use server-side logic for filters we haven't fetched rules for yet (e.g. network error, or initial timeline loading) * Minor optimizations and refactoring * Perform server-side filtering on the streaming server * Change the wording of filter action labels * Fix issues pointed out by linter * Change design of “Show anyway” link in accordence to review comments * Drop “irreversible” filtering behavior * Move /api/v2/filter_keywords to /api/v1/filters/keywords * Rename `filter_results` attribute to `filtered` * Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer * Fix systemChannelId value in streaming server * Simplify code by removing client-side filtering code The simplifcation comes at a cost though: filters aren't retroactively applied anymore.
170 lines
5.4 KiB
JSON
170 lines
5.4 KiB
JSON
{
|
|
"name": "@mastodon/mastodon",
|
|
"license": "AGPL-3.0-or-later",
|
|
"engines": {
|
|
"node": ">=14"
|
|
},
|
|
"scripts": {
|
|
"postversion": "git push --tags",
|
|
"build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
|
|
"build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
|
|
"manage:translations": "node ./config/webpack/translationRunner.js",
|
|
"start": "node ./streaming/index.js",
|
|
"test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
|
|
"test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
|
|
"test:lint:js": "eslint --ext=js . --cache",
|
|
"test:lint:sass": "stylelint '**/*.scss'",
|
|
"test:jest": "cross-env NODE_ENV=test jest",
|
|
"format": "prettier --write '**/*.{json,yml}'",
|
|
"format-check": "prettier --write '**/*.{json,yml}'"
|
|
},
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/mastodon/mastodon.git"
|
|
},
|
|
"private": true,
|
|
"dependencies": {
|
|
"@babel/core": "^7.18.5",
|
|
"@babel/plugin-proposal-decorators": "^7.18.2",
|
|
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
|
|
"@babel/plugin-transform-runtime": "^7.18.5",
|
|
"@babel/preset-env": "^7.18.2",
|
|
"@babel/preset-react": "^7.17.12",
|
|
"@babel/runtime": "^7.18.3",
|
|
"@gamestdio/websocket": "^0.3.2",
|
|
"@github/webauthn-json": "^0.5.7",
|
|
"@rails/ujs": "^6.1.6",
|
|
"array-includes": "^3.1.5",
|
|
"arrow-key-navigation": "^1.2.0",
|
|
"autoprefixer": "^9.8.8",
|
|
"axios": "^0.27.2",
|
|
"babel-loader": "^8.2.5",
|
|
"babel-plugin-lodash": "^3.3.4",
|
|
"babel-plugin-preval": "^5.1.0",
|
|
"babel-plugin-react-intl": "^6.2.0",
|
|
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
|
|
"blurhash": "^1.1.5",
|
|
"classnames": "^2.3.1",
|
|
"cocoon-js-vanilla": "^1.2.0",
|
|
"color-blend": "^3.0.1",
|
|
"compression-webpack-plugin": "^6.1.1",
|
|
"cross-env": "^7.0.3",
|
|
"css-loader": "^5.2.7",
|
|
"cssnano": "^4.1.11",
|
|
"detect-passive-events": "^2.0.3",
|
|
"dotenv": "^16.0.1",
|
|
"emoji-mart": "npm:emoji-mart-lazyload",
|
|
"es6-symbol": "^3.1.3",
|
|
"escape-html": "^1.0.3",
|
|
"exif-js": "^2.3.0",
|
|
"express": "^4.18.1",
|
|
"file-loader": "^6.2.0",
|
|
"font-awesome": "^4.7.0",
|
|
"fuzzysort": "^1.9.0",
|
|
"glob": "^8.0.3",
|
|
"history": "^4.10.1",
|
|
"http-link-header": "^1.0.4",
|
|
"immutable": "^4.1.0",
|
|
"imports-loader": "^1.2.0",
|
|
"intersection-observer": "^0.12.2",
|
|
"intl": "^1.2.5",
|
|
"intl-messageformat": "^2.2.0",
|
|
"intl-relativeformat": "^6.4.3",
|
|
"is-nan": "^1.3.2",
|
|
"js-yaml": "^4.1.0",
|
|
"jsdom": "^20.0.0",
|
|
"lodash": "^4.17.21",
|
|
"mark-loader": "^0.1.6",
|
|
"marky": "^1.2.4",
|
|
"mini-css-extract-plugin": "^1.6.2",
|
|
"mkdirp": "^1.0.4",
|
|
"npmlog": "^6.0.2",
|
|
"object-assign": "^4.1.1",
|
|
"object-fit-images": "^3.2.3",
|
|
"object.values": "^1.1.5",
|
|
"offline-plugin": "^5.0.7",
|
|
"path-complete-extname": "^1.0.0",
|
|
"pg": "^8.5.0",
|
|
"postcss": "^8.4.14",
|
|
"postcss-loader": "^3.0.0",
|
|
"postcss-object-fit-images": "^1.1.2",
|
|
"promise.prototype.finally": "^3.1.3",
|
|
"prop-types": "^15.8.1",
|
|
"punycode": "^2.1.0",
|
|
"react": "^16.14.0",
|
|
"react-dom": "^16.14.0",
|
|
"react-hotkeys": "^1.1.4",
|
|
"react-immutable-proptypes": "^2.2.0",
|
|
"react-immutable-pure-component": "^2.2.2",
|
|
"react-intl": "^2.9.0",
|
|
"react-masonry-infinite": "^1.2.2",
|
|
"react-motion": "^0.5.2",
|
|
"react-notification": "^6.8.5",
|
|
"react-overlays": "^0.9.3",
|
|
"react-redux": "^7.2.8",
|
|
"react-redux-loading-bar": "^4.0.8",
|
|
"react-router-dom": "^4.1.1",
|
|
"react-router-scroll-4": "^1.0.0-beta.1",
|
|
"react-select": "^5.3.2",
|
|
"react-sparklines": "^1.7.0",
|
|
"react-swipeable-views": "^0.14.0",
|
|
"react-textarea-autosize": "^8.3.4",
|
|
"react-toggle": "^4.1.2",
|
|
"redis": "^4.0.6 <4.1.0",
|
|
"redux": "^4.2.0",
|
|
"redux-immutable": "^4.0.0",
|
|
"redux-thunk": "^2.4.1",
|
|
"regenerator-runtime": "^0.13.9",
|
|
"rellax": "^1.12.1",
|
|
"requestidlecallback": "^0.3.0",
|
|
"reselect": "^4.1.6",
|
|
"rimraf": "^3.0.2",
|
|
"sass": "^1.52.3",
|
|
"sass-loader": "^10.2.0",
|
|
"stacktrace-js": "^2.0.2",
|
|
"stringz": "^2.1.0",
|
|
"substring-trie": "^1.0.2",
|
|
"terser-webpack-plugin": "^4.2.3",
|
|
"tesseract.js": "^2.1.1",
|
|
"throng": "^4.0.0",
|
|
"tiny-queue": "^0.2.1",
|
|
"twitter-text": "3.1.0",
|
|
"uuid": "^8.3.1",
|
|
"webpack": "^4.46.0",
|
|
"webpack-assets-manifest": "^4.0.6",
|
|
"webpack-bundle-analyzer": "^4.5.0",
|
|
"webpack-cli": "^3.3.12",
|
|
"webpack-merge": "^5.8.0",
|
|
"wicg-inert": "^3.1.2",
|
|
"ws": "^8.8.0"
|
|
},
|
|
"devDependencies": {
|
|
"@babel/eslint-parser": "^7.18.2",
|
|
"@testing-library/jest-dom": "^5.16.4",
|
|
"@testing-library/react": "^12.1.5",
|
|
"babel-jest": "^28.1.1",
|
|
"eslint": "^7.32.0",
|
|
"eslint-plugin-import": "~2.26.0",
|
|
"eslint-plugin-jsx-a11y": "~6.5.1",
|
|
"eslint-plugin-promise": "~6.0.0",
|
|
"eslint-plugin-react": "~7.30.0",
|
|
"jest": "^28.1.1",
|
|
"jest-environment-jsdom": "^28.1.1",
|
|
"postcss-scss": "^4.0.4",
|
|
"prettier": "^2.7.1",
|
|
"raf": "^3.4.1",
|
|
"react-intl-translations-manager": "^5.0.3",
|
|
"react-test-renderer": "^16.14.0",
|
|
"stylelint": "^14.9.1",
|
|
"stylelint-config-standard-scss": "^4.0.0",
|
|
"webpack-dev-server": "^3.11.3",
|
|
"yargs": "^17.5.1"
|
|
},
|
|
"resolutions": {
|
|
"kind-of": "^6.0.3"
|
|
},
|
|
"optionalDependencies": {
|
|
"bufferutil": "^4.0.6",
|
|
"utf-8-validate": "^5.0.9"
|
|
}
|
|
}
|