384 Commits (f3140305f9396d80e6aa4781bbf4f7ed9f904bf1)

Author SHA1 Message Date
Eugen Rochko 4a3acdc916 Add polls (#10111)
6 years ago
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 77f972d5b1 Add support for non-public reblogs from ActivityPub (#9841)
6 years ago
Thibaut Girka 4aca9b4e0f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 88faa4ff2d Attempt fixing deadlocks by moving account stats update outside transaction (#9437)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
valerauko 2178c50fed Ensure replied-to is a status not a boost (#9129)
6 years ago
Eugen Rochko 62c0e112ea Extract counters from accounts table to account_stats table (#9295)
6 years ago
Eugen Rochko 7a939f7cfc Remove intermediary arrays when creating hash maps from results (#9291)
6 years ago
Thibaut Girka e18018e930 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
James Kiesel d2a9ea58da Allow joining several hashtags in a single column (#8904)
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c3005d09e6 Reset status cache when status_stat or media_attachment updates (#9119)
6 years ago
Eugen Rochko cf2ab9c394 Include preview cards in status entity in REST API (#9120)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 92b93a12cb Do not show "limited" visibility in default visibility preference (#8999)
6 years ago
Eugen Rochko 654520ec8c Improve support for aspects/circles (#8950)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka 86d2a9d480 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
masarakki 86a912d6f0 exclude-other-silenced-accounts (#7528)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
abcang af2122bcf9 Unuse ActiveRecord::Base#cache_key (#8185)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6eca34ffb8 Fix error when trying to update counters for statuses that are gone (#8251)
6 years ago
Thibaut Girka 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d9f9083f26 Update reply counters only if the reply is public/unlisted (#8211)
6 years ago
Eugen Rochko bf5acc3eae Move status counters to separate table, count replies (#8104)
6 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
6 years ago
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko ecec45ff9b Filter out blocked/muted people from profile timelines (#7747)
7 years ago
Eugen Rochko 16173535d9 Add redraft function (#7735)
7 years ago
Akihiko Odaki 3114ac9655 Do not mark remote status sensitive even if spoiler text is present (#7395)
7 years ago
Jenkins a76f40890e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 9e3f9b8250 Improve counter caches on Status and Account (#7644)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
tateisu 9a4bed4837 optimize direct timeline (#7614)
7 years ago
David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG f2ecedaab5 Fixes/do not override timestamps (#7336)
7 years ago
Eugen Rochko 1a653fff95 Add entity cache (#7271)
7 years ago
Emelia Smith 49d9ea6998 Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
David Yip 48f5f736a0 db: make schema.rb version subsume bookmarks migration.
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 0c2a08adeb Remove text requirement when media attached from statuses (#6672)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
David Yip b8e6074c53 Examples for Status#set_locality and .as_tag_timeline.
7 years ago
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 6f3321fe4f set local_only in a before_create callback instead of status service
7 years ago
Erin 7fc6f40a88 remove vestigial Status#local_only? definition
7 years ago
Erin 278d34a0ec Status#not_local_only scope should match nils too
7 years ago
Erin b463321c6f filter local-only statuses from public pages
7 years ago
Erin 993449ee59 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
abcang 3db3ca1258 Fix unnecessary order (#5807)
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 490f3146f2 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Lex Alexander 526b66e871 Retoot count increases without reason (#5363)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
beatrix 6f578c25c6 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
Eugen Rochko da257754b5 Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko d2aeb45461 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Akihiko Odaki f9dd41621f Do not filter statuses with unknown languages (#5045)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
unarist 3978894d05 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 8c96e0d496 Remove local_only scope in Status (#4977)
7 years ago
Eugen Rochko 8bb036350a Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)
7 years ago
Eugen Rochko 5ad3153b0b Fix locking migration on statuses table. Nullable column and NO default value (#4825)
7 years ago
Eugen Rochko 73c613dcfc Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 3135d20283 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Eugen Rochko 5138dde794 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Eugen Rochko 4e7288d18a Fix boolean columns sometimes having a null value (#4162)
7 years ago
Eugen Rochko 348de9dbc3 Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
7 years ago
Eugen Rochko e7810e4031 Fix regression from #3842 (#3892)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
Matt Jankowski b439018342 Language detection defaults to nil (#3666)
8 years ago
Matt Jankowski d339ac2c76 Introduce StatusThreadingConcern (#3490)
8 years ago
Matt Jankowski 533a8cc68b Misc tidying and clean ups (#3445)
8 years ago
Jack Jennings faf53a5a3e Extract authorization policy for viewing statuses (#3150)
8 years ago
Akihiko Odaki 9cc7a3c209 Cover AccountsController more in spec (#3229)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
beatrix 4f3b6cc3be guard against empty domain block list in status scope (#3161)
8 years ago
Eugen Rochko de5e67238b Fix federated timeline excluding local toots when any domain blocks are set (#3151)
8 years ago
Eugen Rochko 5695449335 Add buttons to block and unblock domain (#3127)
8 years ago
Matt Jankowski 6619cfe934 Conditional validations no longer accept strings for if/unless (#3124)
8 years ago
Eugen Rochko 0cafe62561 Account domain blocks (#2381)
8 years ago
alpaca-tc 5523fd6efb Refactor Status#ancestors/descendants (#3092)
8 years ago
alpaca-tc 0d7dc192c3 Optimize Status#permitted_for 24x (#3069)
8 years ago
Eugen Rochko bd7dc50186 Fix change of status callbacks not setting in_reply_to_account_id and (#3072)
8 years ago
Eugen Rochko 5039bc93d5 Feature conversations muting (#3017)
8 years ago
alpaca-tc 4b5edb0d16 Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)
8 years ago
Eugen Rochko 12ef99556e Add conversation model, <ostatus:conversation /> (#3016)
8 years ago
yhirano e5eb070430 annotate models (#2697)
8 years ago
Matt Jankowski c44ef23e50 Filter on allowed user language preferences (#2361)
8 years ago
Matt Jankowski 3e819257ab More status specs (#2564)
8 years ago
Eugen Rochko 886aa14cfc Cache Status#ancestors recursive query results (#2527)
8 years ago
Tomohiro Suwa 7bb45d9ed5 Don't need to include ActiveModel::Validations (#2521)
8 years ago
Evan Minto 227f45402d ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
alpaca-tc e40ea6cd9d Extract error messages to locale file (#2162)
8 years ago
839 95e8ab21a1 Avoid dynamic methods due to processing speed (#2080)
8 years ago
Eugen Rochko 8867792e53 Rename cache key to exclude_account_ids_for:id, adjust formatting
8 years ago
Eugen Rochko 8af5ceb661 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
8 years ago
alpaca-tc 4f0d96aa5e Required foreign keys (#2003)
8 years ago
Effy Elden d52abe1cc7 Merge branch 'master' into fix/cache_blocking
8 years ago
Matt Jankowski a3a4fe2163 Simplify the og:image and og:description code in stream_entries/show (#1934)
8 years ago
Keiji Yoshimi 6ca3a6c9f4 cache blockings for reducing queries.
8 years ago
Eugen d30a82a22f Fix #1339 - better Atom titles (#1343)
8 years ago
Joël Quenneville 8a67fb5eca DRY up reblog vs original status check
8 years ago
Brad Urani 522410589e Eliminate unnecessary queries and query clauses with none and all
8 years ago
Eugen Rochko 24793cdbaa Fix ActionController::Parameters in API issue
8 years ago
Eugen Rochko 96e58cf289 Add counter caches for a large performance increase on API requests
8 years ago
Eugen Rochko f1b9644cfd Add "direct" visibility level in the backend. Web UI is not yet
8 years ago
Eugen Rochko d1e1f26878 Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
8 years ago
Eugen Rochko 9989890e2e Fix #231 - Muting
8 years ago
Kit Redgrave 4554ccd5d0 Mute button progress so far. WIP, doesn't entirely work correctly.
8 years ago
Eugen Rochko c7427bf3c9 Split public timeline into "public timeline" which is local, and
8 years ago
Eugen Rochko 6917e53fe0 Adding index overview for reports in admin UI
8 years ago
Eugen Rochko c001ef3df6 Fix Status.permitted_for scope query
8 years ago
Eugen Rochko ce193afa4f Mentions in private statuses allow mentioned people to see them
8 years ago
Eugen Rochko f0d4a2c9b7 Fix the fix
8 years ago
Eugen Rochko 81be690f95 Fix #614 - extra reply-boolean on statuses to account for cases when replied-to
8 years ago
Eugen Rochko 94cda4cfb9 Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines
8 years ago
Eugen Rochko b1f2683ecc Add API modifiers to limit returned toots from public/hashtag timelines
8 years ago
Eugen Rochko 2f126b1225 Removing failed push notification API, make context loads use cache
8 years ago
Eugen Rochko 727d236fcc Cleaning up format of broadcast real-time messages, removing
8 years ago
Eugen Rochko edcfbee9f5 Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
8 years ago
Eugen Rochko 959e064186 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
8 years ago
blackle e25fc71c2c Implement a click-to-view spoiler system
8 years ago
Eugen Rochko f748a91ec7 Fix #463 - Fetch and display previews of URLs using OpenGraph tags
8 years ago
Eugen Rochko 5d88ef90c9 Fix tests, add applications to eager loading/cache for statuses, fix
8 years ago
Effy Elden 8e0c1914fb Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
8 years ago
Eugen Rochko d7bc0d8a33 Set in_reply_to_account on statuses to non-self value when possible, thus
8 years ago
Eugen Rochko 1ed3bb3a02 Don't show statuses to blocked users
8 years ago
Eugen Rochko 9e0bd72434 Fix account timelines bug
8 years ago
Eugen Rochko 238233440f Follow call on locked account creates follow request instead
8 years ago
Eugen Rochko 11e2159859 Merge branch 'master' into development
8 years ago
Eugen Rochko 8038c663b0 Ensure that reblogs and favs always refer to the original status rather than a reblog wrapper
8 years ago
Eugen Rochko d417da7d3a Private visibility on statuses prevents non-followers from seeing those
8 years ago
Eugen Rochko a4d3947c88 Fix
8 years ago
Eugen Rochko ca0757a6cf Add account suspension
8 years ago
Eugen Rochko 047bdf6fe0 Improve notification model
8 years ago
Eugen Rochko 2d4ce8a867 Fix #248 - Reload all accounts when fetching from cache
8 years ago
Eugen Rochko 23a4f93345 Fix #323 - self-replies to appear in public timelines again
8 years ago
Eugen Rochko 211049ae59 Fix #329 - avatar errors no longer prevent remote accounts from being saved
8 years ago
Eugen Rochko 8d4ef0b6c3 Per-status control for unlisted mode, also federation for unlisted mode
8 years ago
Eugen Rochko 1bb1ec3b8d Further abstract caching for includes
8 years ago
Eugen Rochko 31108d4659 Public and hashtag timelines now exclude reblogs and replies
8 years ago
Eugen Rochko dda6354c76 Implement includes caching for timelines APIs
8 years ago
Eugen Rochko f6a975af8b More query optimizations
8 years ago
Eugen Rochko 30010a6dbd Moving some counter queries out of subqueries in the API
8 years ago
Eugen Rochko 83cdfefa7d Remove orphaned notifications, add scopes param to app create API
8 years ago
Eugen Rochko 8d767b477f Validate presence of text even for remote statuses
8 years ago
Eugen Rochko c6f5eb8aa7 Fix #144 - Filter statuses from blocked users out of ancestors/descendants results
8 years ago
Eugen Rochko e71b152d89 Fix rubocop issues, introduce usage of frozen literal to improve performance
8 years ago
Eugen Rochko d8c2044e65 Fix public timeline query
8 years ago
Eugen Rochko 0b03bbad67 Discard misattributed remote statuses, improve timelines filter
8 years ago
Eugen Rochko 6d9f8ee11e Improve filtering of public/hashtag timelines, both in backlog and real-time
8 years ago
Eugen Rochko beb36e24fe API pagination for all collections using Link header
8 years ago
Eugen Rochko d98b43cf56 Move timelines API from statuses to its own controller, add a check for
8 years ago
Eugen Rochko cb22dce970 Adding hashtags
8 years ago
Eugen Rochko 082e57fc13 Adding hashtag model
8 years ago
Eugen Rochko 71836838dd Enable caching for some rabl views
8 years ago
Eugen Rochko 1eac265f35 Adding public timeline silencing
8 years ago
Eugen Rochko 39d6f837db Actually fix public timeline
8 years ago
Eugen Rochko b1dee1b6d1 Fix #99 - public timeline not just reblogs, fix #98 infinite scrolling issues
8 years ago
Eugen Rochko 41aae40927 Fix #16 - Optimize n+1 queries when checking reblogged/favourited values for status lists in API
8 years ago
Eugen Rochko 19b6f7a013 Filter out reblogs of blocked users from public timeline (the not real-time variant)
8 years ago
Eugen Rochko 102eab0ac9 Public timeline to exclude users you blocked
8 years ago
Eugen Rochko 2d4f9ecebf Validate against multiple reblogs of same status by same account
8 years ago
Eugen Rochko 927333f4f8 Improve code style
8 years ago