mastodon

Commit Graph

Author	SHA1	Message	Date
Claire	eb80789b0b	Fix misleading wording about waitlists (#20850 )	2 years ago
helloworldstack	e9e4938bc9	Fix casing and spacing of words (#20504 )	2 years ago
Eugen Rochko	b5b1a202cc	Fix missing string in admin UI (#19809 )	2 years ago
Claire	125322718b	Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674 ) Fixes #19593	2 years ago
Eugen Rochko	ad83e64795	Fix sidebar and tabs on settings on small screens in admin UI (#19533 )	2 years ago
Eugen Rochko	f8ca3bb2a1	Add ability to view previous edits of a status in admin UI (#19462 ) * Add ability to view previous edits of a status in admin UI * Change moderator access to posts to be controlled by a separate policy	2 years ago
Eugen Rochko	7c152acb2c	Change settings area to be separated into categories in admin UI (#19407 ) And update all descriptions	2 years ago
Eugen Rochko	839f893168	Change public accounts pages to mount the web UI (#19319 ) * Change public accounts pages to mount the web UI * Fix handling of remote usernames in routes - When logged in, serve web app - When logged out, redirect to permalink - Fix `app-body` class not being set sometimes due to name conflict * Fix missing `multiColumn` prop * Fix failing test * Use `discoverable` attribute to control indexing directives * Fix `<ColumnLoading />` not using `multiColumn` * Add `noindex` to accounts in REST API * Change noindex directive to not be rendered by default before a route is mounted * Add loading indicator for detailed status in web UI * Fix missing indicator appearing while account is loading in web UI	2 years ago
prplecake	c618d3a0a5	Make "No $entity selected" errors more accurate (#19356 ) Previously all controllers would use the single "No accounts changed as none were selected" message. This commit changes them to read "tags", "posts", "emojis", etc. where necessary.	2 years ago
Eugen Rochko	1bd00036c2	Change about page to be mounted in the web UI (#19345 )	3 years ago
Eugen Rochko	b04633a961	Add image processing and generate blurhash for server thumbnail (#19348 ) Remove separate server hero setting	3 years ago
Eugen Rochko	45ebdb72ca	Add support for language preferences for trending statuses and links (#18288 )	3 years ago
Eugen Rochko	a2ba011326	Change privacy policy to be rendered in web UI, add REST API (#19310 ) Source string no longer localized, Markdown instead of raw HTML	3 years ago
Eugen Rochko	93f340a4bf	Remove setting that disables account deletes (#17683 )	3 years ago
Eugen Rochko	58d5b28cb0	Remove previous landing page (#19300 )	3 years ago
Eugen Rochko	5fd46dddd7	Remove unnecessary sections from welcome e-mail (#19299 )	3 years ago
Eugen Rochko	679274465b	Add server rules to sign-up flow (#19296 )	3 years ago
Eugen Rochko	02ba9cfa35	Remove code for rendering public and hashtag timelines outside the web UI (#19257 )	3 years ago
Eugen Rochko	36f4c32a38	Change path of privacy policy page (#19249 )	3 years ago
Eugen Rochko	546672e292	Change "Allow trends without prior review" setting to include statuses (#17977 ) * Change "Allow trends without prior review" setting to include posts * Fix i18n-tasks	3 years ago
Eugen Rochko	c556c3a0d1	Add admin API for managing canonical e-mail blocks (#19067 )	3 years ago
Eugen Rochko	0b3e4fd5de	Remove digest e-mails (#17985 ) * Remove digest e-mails * Remove digest-related code	3 years ago
Eugen Rochko	5b0e8cc92b	Add ability to select all accounts matching search for batch actions (#19053 )	3 years ago
Eugen Rochko	0396acf39e	Add audit log entries for user roles (#19040 ) * Refactor audit log schema * Add audit log entries for user roles	3 years ago
Claire	63adef2021	Change wording of a few filter-related strings (#19050 ) Follow-up on #18945 addressing review comments	3 years ago
Claire	50487db122	Add ability to filter individual posts (#18945 ) * Add database table for status-specific filters * Add REST endpoints, entities and attributes * Show status filters in /filters interface * Perform server-side filtering for individual posts filters * Fix filtering on context mismatch * Refactor `toServerSideType` by moving it to its own module * Move loupe and delete icons to their own module * Add ability to filter individual posts from WebUI * Replace keyword list by warnings (expired, context mismatch) * Refactor server-side filtering code * Add tests	3 years ago
Eugen Rochko	44b2ee3485	Add customizable user roles (#18641 ) * Add customizable user roles * Various fixes and improvements * Add migration for old settings and fix tootctl role management	3 years ago
Claire	02851848e9	Revamp post filtering system (#18058 ) * 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.	3 years ago
Eugen Rochko	2936f42a14	Add notifications for new reports (#18697 )	3 years ago
Eugen Rochko	45aa5781ce	Change brand color and logotypes (#18592 ) - Add rake task for generating Apple/Android icons and favicons from SVG - Add rake task for generating PNG icons and logos for e-mails from SVG - Remove obsolete Microsoft icons and configuration - Remove PWA shortcut icons	3 years ago
Eugen Rochko	a2871cd747	Add administrative webhooks (#18510 ) * Add administrative webhooks * Fix error when webhook is deleted before delivery worker runs	3 years ago
Claire	28329ba62f	Add /api/v1/admin/domain_blocks (#18247 ) * Add /api/v1/admin/domain_blocks Fixes #18140 - `GET /api/v1/admin/domain_blocks` lists domain blocks - `GET /api/v1/admin/domain_blocks/:id` shows one by ID - `DELETE /api/v1/admin/domain_blocks/:id` deletes a given domain block - `POST /api/v1/admin/domain_blocks` to create a new domain block: if it conflicts with an existing one, returns an error with an attribute `existing_domain_block` with the rendered domain block * Simplify conflict handling as suggested in review	3 years ago
Eugen Rochko	a4fa9e23fc	Change "dangerous" to "sensitive" in privacy policy and web UI (#18515 ) Fix #18470	3 years ago
Eugen Rochko	42c976fd65	Fix missing string for appeal validation error (#18410 )	3 years ago
Eugen Rochko	2b8dc58b7f	Change RSS feeds (#18356 ) * Change RSS feeds - Use date and time for titles instead of ellipsized text - Use full content in body, even when there is a content warning - Use media extensions * Change feed icons and add width and height attributes to custom emojis * Fix custom emoji animate on hover breaking * Fix tests	3 years ago
Claire	991353682d	Fix ambiguous wording on appeal actions (#18328 ) Fixes #18322	3 years ago
Yamagishi Kazutoshi	fe6a5b0d5a	Add translatable string for #17431 (#18227 ) * Add translatable string for #17431 * Update config/locales/en.yml Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	3 years ago
Yamagishi Kazutoshi	4884e0ca41	Add missing locale (#18061 )	3 years ago
dependabot[bot]	6b72641641	Bump i18n-tasks from 0.9.37 to 1.0.8 (#17993 ) * Bump i18n-tasks from 0.9.37 to 1.0.8 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.37 to 1.0.8. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.37...v1.0.8) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Run `bundle exec i18n-tasks normalize` * Add `admin_mailer.new_appeal.actions.*` to ignore_unused Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Eugen Rochko	6221b36b27	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970 )	3 years ago
Ondřej Pokorný	80ded02a4b	Update en.yml (#17942 ) typo	3 years ago
Claire	e6a159a648	Fix extra “zero” key in some plural translation strings (#17883 )	3 years ago
Eugen Rochko	f572a68a0c	Chore: i18n-tasks normalize (#17873 )	3 years ago
Claire	f65eaa5aae	Add admin dashboard checks for Elasticsearch version (#17863 )	3 years ago
Claire	749fe73ec4	Add tooltip for instance delivery warnings (#17854 )	3 years ago
Claire	9b139d4ef9	Fix “edited at” in public pages not being properly localized (#17806 ) Fixes #17804	3 years ago
Eugen Rochko	91616004fe	Fix not being able to upload GIF emojis in admin UI (#17759 )	3 years ago
Claire	3bc0aeed50	Change text version of warning mail to mention appeals instead of mails (#17725 ) Also, the instruction to reply to e-mail would probably not work in many cases where the notifications e-mail address is not able to receive incoming emails or the mailbox is not actively monitored.	3 years ago
Eugen Rochko	bd53dd5210	Change design of federation pages in admin UI (#17704 ) * Change design of federation pages in admin UI * Fix query performance in instance media attachments measure * Fix reblogs being included in instance languages dimension	3 years ago
Eugen Rochko	dba4be1038	Change appearance of account cards in web UI (#17689 ) * Change appearance of account cards in web UI * Various fixes and improvements * Various fixes and improvements	3 years ago
Claire	02dbc59c91	Add option to automatically delete toots after one week (#17691 ) Fixes #17658	3 years ago
Claire	6d3fa7828e	Redesign /about when already logged in (#17348 ) * Redesign /about when already logged in * Fix sign up form still showing when OMNIAUTH_ONLY is set * Fix tests * Change wording based on suggestions Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	3 years ago
Eugen Rochko	9b58fb1ea4	Add descriptions to trending features in admin UI (#17677 )	3 years ago
Eugen Rochko	462a6f7d72	Fix notification about deleted statuses being too threatening (#17679 )	3 years ago
Eugen Rochko	25d3dc4373	Add ability to mark statuses as sensitive from reports in admin UI (#17668 ) * Add ability to mark statuses as sensitive from reports in admin UI * Allow mark as sensitive action on statuses with preview cards	3 years ago
Claire	14919fe11e	Change old moderation strikes to be displayed in a separate page (#17566 ) * Change old moderation strikes to be displayed in a separate page Fixes #17552 This changes the moderation strikes displayed on `/auth/edit` to be those from the past 3 months, and make all moderation strikes targeting the current user available in `/disputes`. * Add short description of what the strikes page is for * Move link to list of strikes to “Account status” instead of navigation item * Normalize i18n file * Fix layout and styling of strikes link * Revert highlights_on regexp * Reintroduce account status summary - this way, “Account status” is never empty - account status is not necessarily bound to strikes, or recent strikes	3 years ago
Claire	57814a98a9	Fix remote reports with comments revealing remote reporter (#17652 ) * Display username rather than display name in report comment For consistency with report notes and appeals * Fix remote reports with comments revealing remote reporter * Display instance name in placeholder * Make instance name in report comment a link to the federation admin page * Normalize i18n file	3 years ago
Eugen Rochko	27965ce5ed	Add trending statuses (#17431 ) * Add trending statuses * Fix dangling items with stale scores in localized sets * Various fixes and improvements - Change approve_all/reject_all to approve_accounts/reject_accounts - Change Trends::Query methods to not mutate the original query - Change Trends::Query#skip to offset - Change follow recommendations to be refreshed in a transaction * Add tests for trending statuses filtering behaviour * Fix not applying filtering scope in controller	3 years ago
Eugen Rochko	a29a982eaa	Change e-mail domain blocks to block IPs dynamically (#17635 ) * Change e-mail domain blocks to block IPs dynamically * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Eugen Rochko	7b816eb5ae	Add notifications for new sign-ups (#16953 )	3 years ago
Claire	1abf0f9000	Fix 0 pluralization for some localization strings (#17576 ) Apparently, when the `zero` case is not defined, the translation string used for `0` depends on the language. In French, `one` is used, causing some strings with hardcoded “one” or `1` to misrepresent the actual data. For instance, the dashboard would display « 1 utilisateur·rice en attente » for both 0 and 1 pending users.	3 years ago
Eugen Rochko	564efd0651	Add appeals (#17364 ) * Add appeals * Add ability to reject appeals and ability to browse pending appeals in admin UI * Add strikes to account page in settings * Various fixes and improvements - Add separate notification setting for appeals, separate from reports - Fix style of links in report/strike header - Change approving an appeal to not restore statuses (due to federation complexities) - Change style of successfully appealed strikes on account settings page - Change account settings page to only show unappealed or recently appealed strikes * Change appealed_at to overruled_at * Fix missing method error	3 years ago
Eugen Rochko	8f03b7a2fb	Add notifications when a reblogged status has been updated (#17404 ) * Add notifications when a reblogged status has been updated * Change wording to say "edit" instead of "update" and add missing controls * Replace previous update notifications with the most up-to-date one	3 years ago
Eugen Rochko	d0fcf07436	Change actions in reports to require only one click (#17487 )	3 years ago
Eugen Rochko	2f8159baad	Add `category` and `rule_ids` params to `POST /api/v1/reports` (#17492 )	3 years ago
Eugen Rochko	b6d7726ecb	Remove language detection through cld3 (#17478 ) * Remove language detection through cld3 * Update app/helpers/languages_helper.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Claire	bddd9ba36d	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288 ) * Remove support for OAUTH_REDIRECT_AT_SIGN_IN Fixes #15959 Introduced in #6540, OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form to instead redirect to the external OmniAuth login provider. However, it did not prevent the log-in form on /about introduced by #10232 from appearing, and completely broke with the introduction of #15228. As I restoring that previous log-in flow without introducing a security vulnerability may require extensive care and knowledge of how OmniAuth works, this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time being. * Add OMNIAUTH_ONLY environment variable to enforce external log-in only * Disable user registration when OMNIAUTH_ONLY is set to true * Replace log-in links When OMNIAUTH_ONLY is set with exactly one OmniAuth provider	3 years ago
Claire	6eea3f8f9c	Add post edited notice in admin and public UIs (#17335 ) * Add edited toot flag on public pages * Add toot edit flag to admin pages	3 years ago
Eugen Rochko	14f436c457	Add notifications for statuses deleted by moderators (#17204 )	3 years ago
Claire	d5c9feb7b7	Add support for private pinned posts (#16954 ) * Add support for private pinned toots * Allow local user to pin private toots * Change wording to avoid "direct message"	3 years ago
Claire	76761d5fc0	Add ability for admins to delete canonical email blocks (#16644 ) * Add admin option to remove canonical email blocks from a deleted account * Add tootctl canonical_email_blocks to inspect and remove canonical email blocks	3 years ago
Claire	7f803c41e2	Add ability to purge undeliverable domains from admin interface (#16686 ) * Add ability to purge undeliverable domains from admin interface * Add tests	3 years ago
Claire	0fc73bbcb9	Fix incorrect singular version of some translation strings (#17124 ) Fixes #17120 Co-authored-by: Mélanie Chauvel <perso@hack-libre.org> Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>	3 years ago
Eugen Rochko	0fb9536d38	Add batch suspend for accounts in admin UI (#17009 )	3 years ago
Eugen Rochko	7de0ee7aba	Remove Keybase integration (#17045 )	3 years ago
Eugen Rochko	6e50134a42	Add trending links (#16917 ) * Add trending links * Add overriding specific links trendability * Add link type to preview cards and only trend articles Change trends review notifications from being sent every 5 minutes to being sent every 2 hours Change threshold from 5 unique accounts to 15 unique accounts * Fix tests	3 years ago
Jeong Arm	f4081d1564	Allow keeping only 1 boosts/favs on auto deleting posts (#16653 ) * Allow keeping 1 boosts/favs on auto deleting posts * Fix tests	4 years ago
Eugen Rochko	07341e7aa6	Add graphs and retention metrics to admin dashboard (#16829 )	4 years ago
Claire	7c7e78d807	Fix suspicious sign-in mail text being out of date (#16690 ) Fixes #16687	4 years ago
Claire	4ac78e2a06	Add feature to automatically delete old toots (#16529 ) * Add account statuses cleanup policy model * Record last inspected toot to delete to speed up successive calls to statuses_to_delete * Add service to cleanup a given account's statuses within a budget * Add worker to go through account policies and delete old toots * Fix last inspected status id logic All existing statuses older or equal to last inspected status id must be kept by the current policy. This is an invariant that must be kept so that resuming deletion from the last inspected status remains sound. * Add tests * Refactor scheduler and add tests * Add user interface * Add support for discriminating based on boosts/favs * Add UI support for min_reblogs and min_favs, rework UI * Address first round of review comments * Replace Snowflake#id_at_start with with_random parameter * Add tests * Add tests for StatusesCleanupController * Rework settings page * Adjust load-avoiding mechanisms * Please CodeClimate	4 years ago
Eugen Rochko	7095c80373	Add ability to filter reports by origin of target account (#16487 )	4 years ago
Eugen Rochko	771c9d4ba8	Add ability to skip sign-in token authentication for specific users (#16427 ) Remove "active within last two weeks" exception for sign in token requirement Change admin reset password to lock access until the password is reset	4 years ago
Eugen Rochko	d174d12c83	Add authentication history (#16408 )	4 years ago
Mélanie Chauvel	fd5ab80eed	Fix some typos and improve some UI text (#16283 ) * Fix typo: similiar → similar Suggestion of unextro: https://crowdin.com/profile/unextro * Fix typo: ChromeOS → Chrome OS Suggestion of unextro: https://crowdin.com/profile/unextro * Fix typo: Successfully remove → Successfully removed Suggestion of GunChleoc: https://crowdin.com/profile/gunchleoc * Fix typo: will now be processed in due time → will be processed Suggestion of NCAA: https://crowdin.com/profile/ncaa * Improve UI text: use “waiting period” instead of “cooldown period” Suggestion of NCAA: https://crowdin.com/profile/ncaa * Improve UI text: use “for today” instead of “for that day” Suggestion of NCAA: https://crowdin.com/profile/ncaa	4 years ago
Mélanie Chauvel	d137d2ab87	Replace “status” and “message” by “post” in WebUI (#16271 )	4 years ago
Eugen Rochko	74081433d0	Change trending hashtags to be affected be reblogs (#16164 ) If a status with a hashtag becomes very popular, it stands to reason that the hashtag should have a chance at trending Fix no stats being recorded for hashtags that are not allowed to trend, and stop ignoring bots Remove references to hashtags in profile directory from the code and the admin UI	4 years ago
Takeshi Umeda	7cb34b32f8	Add management of delivery availability in Federation settings (#15771 ) * Add management of delivery availavility in Federation settings * fix translate * Remove useless object creation * Fix DeepSource issue * Add shortcut for all * Fix DeepSource(skipcq) * Change 'remove' to 'clear' * Fix style * Change class method name (exhausted_deliveries_key_by)	4 years ago
Eugen Rochko	daccc07dc1	Change auto-following admin-selected accounts, show in recommendations (#16078 )	4 years ago
Eugen Rochko	9cc283f0b4	Change the nouns "toot" and "status" to "post" (#16080 )	4 years ago
Claire	e243092a5a	Add DM icon back on HTML view of DMs (#16086 ) Fix regression from #16052	4 years ago
Eugen Rochko	23b102f661	Add "recommended" label to activity/peers API toggles in admin UI (#16081 )	4 years ago
Eugen Rochko	480d7c9478	Fix missing source strings and inconsistent lead text style in admin UI (#16052 )	4 years ago
Eugen Rochko	f7117646af	Add cold-start follow recommendations (#15945 )	4 years ago
Eugen Rochko	619fad6cf8	Remove spam check and dependency on nilsimsa gem (#16011 )	4 years ago
Eugen Rochko	487e37d6d4	Add system checks to dashboard in admin UI (#15989 )	4 years ago
Claire	59f94593d0	Add warning in admin dashboard if some required queues are not handled (#15954 )	4 years ago
Claire	876840e9ef	Fix brakeman warning (#15870 ) As far as I understand, the brakeman warning was a false-positive as `content_tag` properly escapes untrusted HTML. Furthermore, the interpolated string values are built from the “username” part of accounts, which is restricted to a small subset of ASCII that precludes any XML entity or HTML code. This proposed change should be functionally equivalent to the current code, however it is slightly more robust, it's more idiomatic, and Brakeman will stop complaining about it.	4 years ago
Claire	d023eefbcc	Fix push notification title for polls (#15931 )	4 years ago
Claire	0ff4264c3e	Add missing push notification title for polls (#15929 )	4 years ago
Marcin Mikołajczak	8fa11b0e83	Add missing `en.notification_mailer.status.subject` (#15564 ) * Add missing `en.notification_mailer.status.subject` * Update en.yml	4 years ago

1 2 3 4 5 ...

531 Commits (922f086253c8bfcead9df895f4624580d5b61a9c)