67 Commits (e4f8679eaeea062e1f9ca9f58703b51ff8162c35)

Author	SHA1	Message	Date
Thibaut Girka	9748f074a3	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.	5 years ago
Eugen Rochko	e8bc187845	Refactor how public and tag timelines are queried (#14728)	5 years ago
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	5 years ago
Takeshi Umeda	26b08a3c54	Add remote only to public timeline (#13504) ... * Add remote only to public timeline * Fix code style	5 years ago
ThibG	a4240fd027	Improve RSS entries for statuses (#13592) ... * Improve RSS entries for statuses - Render polls in both accounts and tags serializers - Refactor RSS serializers - Change title preview to include ellipsis when truncated - Change title preview to show CW instead of toot text - Add tests * Remove title from OEmbed serialization Twitter doesn't serialize title either, and tihs allows us to move the title formatting code to the RSS serializers.	5 years ago
Thibaut Girka	a22e6a3683	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	5 years ago
Yamagishi Kazutoshi	e223fd8c61	Revert "improve status title (#8596)" (#13591) ... This reverts commit 05756c9a14.	5 years ago
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	5 years ago
Alexander	05756c9a14	improve status title (#8596) ... * improve shown status title, useful for atom/rss * use single quotes to satisfy codeclimate * fix tests, make message more pretty * fix tests * fix codestyle * fix codestyle * remove atom_serializer_spec Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	5 years ago
Thibaut Girka	61631f4751	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	6 years ago
Eugen Rochko	f665901e3c	Fix performance of home feed regeneration (#12084) ... Fetching statuses from all followed accounts at once takes too long within Postgres. Fetching them one by one and merging in Ruby could be a lot less resource-intensive Because the query for dynamically fetching the home timeline is so heavy, we can no longer offer it when the home timeline is missing	6 years ago
Eugen Rochko	3fd6ab99e6	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	6 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ashleyhull-versent	f194857ac9	rubocop issues - Cleaning up (#8912) ... * cleanup pass * undo mistakes * fixed. * revert	7 years ago
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
masarakki	4bdab203ac	exclude-other-silenced-accounts (#7528)	7 years ago
Thibaut Girka	bfeac6747a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.	7 years ago
Eugen Rochko	d010816ba8	Fix error when trying to update counters for statuses that are gone (#8251)	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	a7d726c383	Improve counter caches on Status and Account (#7644) ... Do not touch statuses_count on accounts table when mass-destroying statuses to reduce load when removing accounts, same for reblogs_count and favourites_count Do not count statuses with direct visibility in statuses_count Fix #828	7 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
tateisu	b87a1229c7	optimize direct timeline (#7614) ... * optimize direct timeline * fix typo in class name * change filter condition for direct timeline * fix codestyle issue * revoke index_accounts_not_silenced because direct timeline does not use it. * revoke index_accounts_not_silenced because direct timeline does not use it. * fix rspec test condition. * fix rspec test condition. * fix rspec test condition. * revoke adding column and partial index * (direct timeline) move merging logic to model * fix pagination parameter * add method arguments that switches return array of status or cache_ids * fix order by * returns ActiveRecord.Relation in default behavor * fix codestyle issue	7 years ago
Kaito Sinclaire	156b916caf	Direct messages column (#4514) ... * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	7 years ago
David Yip	6abb0950c6	Examples for Status.as_public_timeline. ... Also adjust the examples for Status.as_tag_timeline to match the nomenclature used in .as_public_timeline (e.g. "account" -> "viewer").	8 years ago
David Yip	e35a350119	Examples for Status#set_locality and .as_tag_timeline. ... This commit also: - exposes the local-only emoji so that it can be used in examples - allows local_only to be set explicitly, i.e. for timeline filtering specs	8 years ago
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	8 years ago
ysksn	9d9b1aff1e	Add tests for Status#title (#5718)	8 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	8 years ago
ysksn	556c07df1f	Add tests for Status#verb (#5717)	8 years ago
ysksn	3023725936	Add tests for Status#hidden? (#5719)	8 years ago
Matthew Walsh	3db80f75a6	Added a timeline for Direct statuses ... * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	8 years ago
Akihiko Odaki	0de82dd316	Do not filter statuses with unknown languages (#5045)	8 years ago
unarist	dd6f9a1b82	Validate uri presence for remote status (#4985)	8 years ago
Akihiko Odaki	198a9a4fa4	Remove local_only scope in Status (#4977)	8 years ago
Eugen Rochko	e7adbf572a	Switch to static URIs, new URI format in both protocols for new statuses (#4815) ... * Decouple Status#local? from uri being nil * Replace on-the-fly URI generation with stored URIs - Generate URI in after_save hook for local statuses - Use static value in TagManager when available, fallback to tag format - Make TagManager use ActivityPub::TagManager to understand new format - Adjust tests * Use other heuristic for locality of old statuses, do not perform long query * Exclude tombstone stream entries from Atom feed * Prevent nil statuses from landing in Pubsubhubbub::DistributionWorker * Fix URI not being saved (#4818) * Add more specs for Status * Save generated uri immediately and also fix method order to minimize diff. * Fix alternate HTML URL in Atom * Fix tests * Remove not-null constraint from statuses migration to speed it up	8 years ago
Eugen Rochko	53b2b1b238	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) ... * Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI	8 years ago
Eugen Rochko	0190aac240	Fix regression from #3842 (#3892) ... * Fix regression from #3842 Simplify the query by omitting all direct statuses. Private statuses are allowed because they are from accounts we are following (so by definition) Resolves #3887 (alternative) * Adjust test	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	bab5a18232	Filter direct statuses in Status.as_home_timeline (#3842) ... The classes using Status.as_home_timeline, namely Feed and PrecomputeFeedService are expected to filter direct statuses as FanOutWriteService does, but their filtering were incomplete or missing. This commit solves the problem by filtering direct statuses in as_home_timeline as the other similar methods such as as_public_timeline does.	8 years ago
Matt Jankowski	6201f96b8a	Introduce StatusThreadingConcern (#3490) ... * Add a StatusFilter class to identify visibility of statuses by accounts * Extract StatusThreadingConcern from Status * Clarify purpose of checking for nil account	8 years ago
Jack Jennings	3a2003ba86	Extract authorization policy for viewing statuses (#3150)	8 years ago
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175) ... * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	8 years ago
Eugen Rochko	d3be2b582a	More tests for public timeline method (#3171)	8 years ago
Eugen Rochko	620d0d8029	Account domain blocks (#2381) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb	8 years ago
alpaca-tc	a2a2af244c	Optimize Status#permitted_for 24x (#3069) ... * Build query with arel node * Add spec for current Status#permitted_for implementation * Refactor status.rb * Order by visibility to optimize query	8 years ago
Eugen Rochko	d0dd9eb5b5	Feature conversations muting (#3017) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation	8 years ago
alpaca-tc	e9810cbad6	Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)	8 years ago
Eugen Rochko	5abdc77c80	Add conversation model, <ostatus:conversation /> (#3016) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Fix conversation migration * More spec coverage for status before_create * Prevent n+1 query when generating Atom with the new conversations * Improve code style * Remove redundant local variable	8 years ago