293 Commits (d6a7d62dc698d6ebaa3a40f44c20ef12f8474fd7)

Author	SHA1	Message	Date
Thibaut Girka	f509815379	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	4edf5213dc	Add post-deployment migration script to delete public-boosts-of-private-toots (#10783)	6 years ago
Thibaut Girka	bfc509f44a	Add database row to hold status content type	6 years ago
Thibaut Girka	6badf2d252	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	14f6ce2885	Record account suspend/silence time and keep track of domain blocks (#10660) ... * Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive	6 years ago
Thibaut Girka	68629f2773	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	6 years ago
Jeong Arm	ce8635605c	Record deleted(by mod) status to prevent re-appear (#10732) ... * Record deleted(by mod) status to prevent re-appear * Move to Tombstone * Add missing migration script	6 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
Eugen Rochko	fba96c808d	Add blurhash (#10630) ... * Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Eugen Rochko	8b69a66380	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	6 years ago
Thibaut Girka	1d6152f440	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.	6 years ago
Eugen Rochko	9c4cbdbafb	Add Keybase integration (#10297) ... * create account_identity_proofs table * add endpoint for keybase to check local proofs * add async task to update validity and liveness of proofs from keybase * first pass keybase proof CRUD * second pass keybase proof creation * clean up proof list and add badges * add avatar url to keybase api * Always highlight the “Identity Proofs” navigation item when interacting with proofs. * Update translations. * Add profile URL. * Reorder proofs. * Add proofs to bio. * Update settings/identity_proofs front-end. * Use `link_to`. * Only encode query params if they exist. URLs without params had a trailing `?`. * Only show live proofs. * change valid to active in proof list and update liveness before displaying * minor fixes * add keybase config at well-known path * extremely naive feature flagging off the identity proof UI * fixes for rubocop * make identity proofs page resilient to potential keybase issues * normalize i18n * tweaks for brakeman * remove two unused translations * cleanup and add more localizations * make keybase_contacts an admin setting * fix ExternalProofService my_domain * use Addressable::URI in identity proofs * use active model serializer for keybase proof config * more cleanup of keybase proof config * rename proof is_valid and is_live to proof_valid and proof_live * cleanup * assorted tweaks for more robust communication with keybase * Clean up * Small fixes * Display verified identity identically to verified links * Clean up unused CSS * Add caching for Keybase avatar URLs * Remove keybase_contacts setting	6 years ago
Thibaut Girka	291012ec0c	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.	6 years ago
ThibG	a20354a20b	Set and store report URIs (#10303) ... Fixes #10271	6 years ago
Thibaut Girka	09ac5e7528	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	9915777a17	Migrate existing `open_registrations` setting to the new `registrations_mode` (#10269) ... * Migrate existing `open_registrations` setting to the new `registrations_mode` Fixes #10263 * Remove unrelated db changes that have creeped in	6 years ago
Thibaut Girka	07eb31eeac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.	6 years ago
Eugen Rochko	51e154f5e8	Admission-based registrations mode (#10250) ... Fix #6856 Fix #6951	6 years ago
Thibaut Girka	cf4fd8bcfe	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	96f905f409	Add optimistic lock to avoid race conditions when handling votes (#10196) ... * Add optimistic lock to avoid race conditions when handling votes * Force-reload polls when getting `ActiveRecord::StaleObjectError`	6 years ago
Thibaut Girka	f513317ba2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	6 years ago
ThibG	833ffce2df	Store remote votes URI (#10158) ... * Store remote votes URI * Add spec for accepting remote votes * Make poll vote id generation work the same way as follows	6 years ago
Eugen Rochko	230a012f00	Add polls (#10111) ... * Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media	6 years ago
Thibaut Girka	bf94a43496	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	6 years ago
Eugen Rochko	364f2ff9aa	Add featured hashtags to profiles (#9755) ... * Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10	6 years ago
Eugen Rochko	d14c276e58	Add option to overwrite imported data (#9962) ... * Add option to overwrite imported data Fix #7465 * Add import for domain blocks	6 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream ... No conflicts.	6 years ago
ThibG	75b1488cf4	Add tombstones for remote statuses (#9830) ... * Add Tombstone model to remember object deletion * Do not recreate a status if it has been deleted * Record Tombstone for remote deleted items Also, only record deleted items from same-host actors * Clear an user's tombstones when their key change	6 years ago
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	6 years ago
Thibaut Girka	fb0c906c71	Revert "Revert "Add handler for Move activity (#9629)"" ... This reverts commit bb96a74637.	6 years ago
Eugen Rochko	a49d43d112	Add scheduled statuses (#9706) ... Fix #340	6 years ago
Thibaut Girka	bb96a74637	Revert "Add handler for Move activity (#9629)" ... This reverts commit 0f938ff29c.	6 years ago
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	6 years ago
Eugen Rochko	0f938ff29c	Add handler for Move activity (#9629)	6 years ago
Eugen Rochko	5d2fc6de32	Add REST API for creating an account (#9572) ... * Add REST API for creating an account The method is available to apps with a token obtained via the client credentials grant. It creates a user and account records, as well as an access token for the app that initiated the request. The user is unconfirmed, and an e-mail is sent as usual. The method returns the access token, which the app should save for later. The REST API is not available to users with unconfirmed accounts, so the app must be smart to wait for the user to click a link in their e-mail inbox. The method is rate-limited by IP to 5 requests per 30 minutes. * Redirect users back to app from confirmation if they were created with an app * Add tests * Return 403 on the method if registrations are not open * Require agreement param to be true in the API when creating an account	6 years ago
Thibaut Girka	3e686beaea	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.	6 years ago
Eugen Rochko	3c033c4352	Add moderation warnings (#9519) ... * Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain	6 years ago
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	6 years ago
Adam Copp	7d00e4edbd	Make custom emoji domains case insensitive #9351 (#9474) ... * Make custom emoji domains case sensitive #9351 * Fixup style in downcase_domain to comply with codeclimate. * switch if! to unless * Don't use transactions, operate in batches. Also revert spurious schema change.	6 years ago
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	6 years ago
Eugen Rochko	73be8f38c1	Add profile directory (#9427) ... Fix #5578	7 years ago
Thibaut Girka	53d0293d25	Add database support for list show-reply preferences	7 years ago
Thibaut Girka	55edfd6e0e	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	4afda5444a	Change identities id column to a bigint (#9371) ... * fix: change Identity's id column to a bigint This appears to be the last model created using a 5.0 migration, where column types defaulted to `integer` rather than `bigint`. This migration changes the column type to match that of all of the other ID columns. * Change user_id column in identities to bigint and fix down-migration	7 years ago
Thibaut Girka	f8e07ca5cd	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	7 years ago
Eugen Rochko	d6b9a62e0a	Extract counters from accounts table to account_stats table (#9295)	7 years ago
Thibaut Girka	c13cfeac09	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	eef8d9a5f7	Add locality check to ActivityPub::FetchRemoteAccountService (#9109) ... * Add locality check to ActivityPub::FetchRemoteAccountService Fix #8643 Because there are a few places where it is called, it is difficult to confirm if they all previously checked it for locality. It's better to make sure within the service. * Remove faux-remote duplicates of local accounts	7 years ago
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	7 years ago