Thibaut Girka
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
Yamagishi Kazutoshi
d2ee48977c
Rescue Mastodon::LengthValidationError in FetchLinkCardService ( #7424 )
7 years ago
Surinna Curtis
01dfd6dbc8
Take the first recognized actor_type. ( #7410 )
7 years ago
ThibG
993e68a7dd
Fix hashtags not being federated on mentions ( fixes #6900 ) ( #7406 )
7 years ago
Eugen Rochko
42cd363542
Bot nameplates ( #7391 )
...
* Store actor type in database
* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365
* Fix code style issues
7 years ago
Eugen Rochko
0f0cc3f2eb
Support explicitly supplying language code for status via REST API ( #7389 )
7 years ago
Eugen Rochko
c947e2e4c5
Fix handling of malformed ActivityPub payloads when URIs are nil ( #7370 )
...
* Fix handling of malformed ActivityPub payloads when URIs are nil
* Gracefully handle JSON-LD canonicalization failures
7 years ago
Eugen Rochko
c73ce7b695
Store home feeds for 7 days instead of 14 ( #7354 )
...
* Store home feeds for 7 days instead of 14
Reduces workload for status fan-out to active followers
* Fix test for user model
7 years ago
David Yip
c816701550
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
7 years ago
Eugen Rochko
658cbc9425
Improve PostStatusService performance ( #7317 )
...
Offload creation of local notifications to a worker. Remove two
redundant SQL queries from ProcessMentionsService, remove n+1
XML/JSON serialization via memoization
7 years ago
Eugen Rochko
cb5b5cb5f7
Slightly reduce RAM usage ( #7301 )
...
* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts
7 years ago
abcang
71a7cea73f
Keep notification when muting_notifications is true ( #7311 )
...
* Keep notification when muting_notifications is true
* Retrun mute object
* Fix test
7 years ago
Eugen Rochko
f62539ce5c
Remove most behaviour disparities between blocks and mutes ( #7231 )
...
* Remove most behaviour disparities between blocks and mutes
The only differences between block and mute should be:
- Mutes can optionally NOT affect notifications
- Mutes should not be visible to the muted
Fix #7230
Fix #5713
* Do not allow boosting someone you blocked
Fix #7248
* Do not allow favouriting someone you blocked
* Fix nil error in StatusPolicy
7 years ago
Eugen Rochko
965345316f
Guard against nil URLs in Request class ( #7284 )
...
Fix #7265
7 years ago
Surinna Curtis
dc786c0cf4
Support Actors/Statuses with multiple types ( #7305 )
...
* Add equals_or_includes_any? helper in JsonLdHelper
* Support arrays in JSON-LD type fields for actors/tags/objects.
* Spec for resolving accounts with extension types
* Style tweaks for codeclimate
7 years ago
Emelia Smith
495303d9b8
Prevent suspended accounts from appearing in AccountSearchService ( #7246 )
7 years ago
Eugen Rochko
75c4ab9d12
Remove "nsfw" category for sensitive statuses in OStatus serializer ( #7048 )
...
Fix #7011
7 years ago
David Yip
16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/home_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
7 years ago
Eugen Rochko
ff87d1bc3e
Rescue SSL errors when processing mentions, remove useless line ( #7184 )
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
ThibG
1c379b7ef4
Remove extra spaces from search API queries and public account headers ( fixes #7129 ) ( #7152 )
7 years ago
David Yip
813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
db/schema.rb
7 years ago
Eugen Rochko
78ed4ab75f
Add bio fields ( #6645 )
...
* Add bio fields
- Fix #3211
- Fix #232
- Fix #121
* Display bio fields in web UI
* Fix output of links and missing fields
* Federate bio fields over ActivityPub as PropertyValue
* Improve how the fields are stored, add to Edit profile form
* Add rel=me to links in fields
Fix #121
7 years ago
Jenkins
e3d0d72b29
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
778562c223
Ensure SynchronizeFeaturedCollectionWorker is unique and clean up ( #7043 )
...
* Ensure SynchronizeFeaturedCollectionWorker is unique and clean up
Fix #7041
* Fix code style issue
7 years ago
Jenkins
33c2bbdda7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira
0c52654b52
When creating status, if no sensitive status is given, use default ( #7057 )
...
Clients using the API that do not provide the sensitive flag are always
posting with false sensitive option.
7 years ago
Jenkins
6611100480
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson
6ff3b3e4db
Fix nil account issue in ProcessAccountService ( #7019 )
7 years ago
David Yip
eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/views/accounts/_header.html.haml
7 years ago
Eugen Rochko
f890d2a766
Support all ActivityPub actor types ( #6997 )
...
Fix #6973
7 years ago
David Underwood
123a343d11
[WIP] Enable custom emoji on account pages and in the sidebar ( #6124 )
...
Federate custom emojis with accounts
7 years ago
Jenkins
f0bb3ff533
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG
e573bb0990
Fix compatibility with PeerTube ( #6968 )
...
* Support fetching objects of convertible types by URL (fixes #6924 )
* Ignore invalid hashtags
7 years ago
David Yip
f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
7 years ago
Akihiko Odaki
40e5d2303b
Validate HTTP response length while receiving ( #6891 )
...
to_s method of HTTP::Response keeps blocking while it receives the whole
content, no matter how it is big. This means it may waste time to receive
unacceptably large files. It may also consume memory and disk in the
process. This solves the inefficency by checking response length while
receiving.
7 years ago
Jenkins
837b3804bf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki
54b273bf99
Close http connection in perform method of Request class ( #6889 )
...
HTTP connections must be explicitly closed in many cases, and letting
perform method close connections makes its callers less redundant and
prevent them from forgetting to close connections.
7 years ago
Jenkins
e8aeec4fea
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
9381a7d9d5
Use username/domain to match existing accounts in ActivityPub ( #6842 )
...
See also: #6837 , #6667
7 years ago
Jenkins
9341b982b6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool
566ace2d64
Add entropy to download filenames ( #6811 )
...
pretty quick fix, and with the 1 week expiration i don't think we need to be too worried about the existing files
closes #6798
7 years ago
Jenkins
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
510c9049c7
For now, put a "." into no-text statuses with media for backcompat ( #6691 )
7 years ago
Eugen Rochko
64db9ed5f6
After blocking domain with reject_media, invalidate cache ( #6679 )
...
Media attachments are part of the association cache of statuses,
since they are presumed to be immutable. Unless this cache is
cleared manually, the statuses will continue to look like they
have media embedded.
7 years ago
Eugen Rochko
cfa9b6e13a
Remove text requirement when media attached from statuses ( #6672 )
7 years ago
Eugen Rochko
9110db41c5
Federate pinned statuses over ActivityPub ( #6610 )
...
* Federate pinned statuses over ActivityPub
* Display pinned toots in web UI
Fix #6117
* Fix migration
* Fix tests
* Update outbox_serializer.rb
* Update remove_serializer.rb
* Update add_serializer.rb
* Update fetch_featured_collection_service.rb
7 years ago
Aboobacker MK
49092945ab
Fix 500 while searching after deleting a post ( #6604 )
...
Fixes #6602
7 years ago
David Yip
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
7 years ago
Eugen Rochko
41a01bec23
Federated reports ( #6570 )
...
* Fix #2176 : Federated reports
* UI for federated reports
* Add spec for ActivityPub Flag handler
* Add spec for ReportService
7 years ago