tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
9,923 Commits 20 Branches 113 Tags 222 MiB
e9f88f4005
Commit Graph

9923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko
1a747f7020
Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230) 2019-07-02 01:01:17 +02:00
Eugen Rochko
bc60d794f8
Change ActivityPub::DeliveryWorker to not retry HTTP 501 errors (#11233) 2019-07-02 00:59:53 +02:00
ThibG
dc88d226e1 When deleting & redrafting a poll, fill in closest expires_in (#11203) 
Use the smallest preset expires_in such that the new poll would
not expire before the old one.

In the typical case of a quick delete & redraft, this results in
using the same poll duration.

Fixes #10567
 2019-07-02 00:36:16 +02:00
Eugen Rochko
0d9ffe56fb
Add request pool to improve delivery performance (#10353) 
* Add request pool to improve delivery performance

Fix #7909

* Ensure connection is closed when exception interrupts execution

* Remove Timeout#timeout from socket connection

* Fix infinite retrial loop on HTTP::ConnectionError

* Close sockets on failure, reduce idle time to 90 seconds

* Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server

* Use a shared pool size, 512 by default, to stay below open file limit

* Add some tests

* Add more tests

* Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds

* Use a shared pool that returns preferred connection but re-purposes other ones when needed

* Fix wrong connection being returned on subsequent calls within the same thread

* Reduce mutex calls on flushes from 2 to 1 and add test for reaping
 2019-07-02 00:34:38 +02:00
Thibaut Girka
c94966891a Minor cleanup and maybe minor performance improvements 2019-07-01 19:31:21 +02:00
Thibaut Girka
9d6b46fe34 Minor optimization regarding regexp filtering in timelines 2019-07-01 19:31:21 +02:00
Thibaut Girka
c49f7d5d16 Use strict equality rather than Immutable.is as the compared props are values 2019-07-01 19:31:10 +02:00
Thibaut Girka
82a76f03a4 Assume children of visible IntersectionObserverArticle always change 
This fixes multiple issues, while adding few computations
 2019-07-01 19:31:10 +02:00
Thibaut Girka
c0b5ee315d Revert to using upstream's optimisations 
This *does* break things, as `shouldComponentUpdate` assume the
children to never change!
 2019-07-01 19:31:10 +02:00
Thibaut Girka
0ef6a114e7 Fix error boundary DOM 2019-07-01 19:30:59 +02:00
Thibaut Girka
82cd138c89 Fix some React warnings 2019-07-01 19:30:59 +02:00
ThibG
687680f241
Merge pull request #1148 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-01 19:30:46 +02:00
Eugen Rochko
2cfa427ea7
Change domain block behaviour to prevent creation of accounts from suspended domains (#11219) 2019-07-01 19:13:30 +02:00
dependabot-preview[bot]
13f54f41ad Bump rubocop from 0.71.0 to 0.72.0 (#11229) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.71.0 to 0.72.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.71.0...v0.72.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 22:36:45 +09:00
dependabot-preview[bot]
ffb6da8b78 Bump capybara from 3.24.0 to 3.25.0 (#11225) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.24.0 to 3.25.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.24.0...3.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 22:34:51 +09:00
dependabot-preview[bot]
8c4287c239 Bump memory_profiler from 0.9.13 to 0.9.14 (#11227) 
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.13 to 0.9.14.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.13...v0.9.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 22:34:25 +09:00
dependabot-preview[bot]
47b4cd0fff Bump bullet from 6.0.0 to 6.0.1 (#11228) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.0...6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 22:33:54 +09:00
dependabot-preview[bot]
3936404911 Bump eslint-plugin-promise from 4.1.1 to 4.2.1 (#11223) 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 21:29:56 +09:00
dependabot-preview[bot]
d33a30377c Bump webpack-cli from 3.3.4 to 3.3.5 (#11221) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.4...v3.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 21:23:40 +09:00
ThibG
082b3b282f Fix expiration date of filters being set to “Never” when editing them (#11204) 
When editing a custom filter, select the shortest preset duration that
still covers the remaining time of that filter.

Fixes #9506
 2019-06-30 16:11:21 +02:00
Eugen Rochko
06424786a1
Fix support for MP4 files that are actually M4V files (#11210) 
Resolve #11187
 2019-06-30 16:10:43 +02:00
Thibaut Girka
b6e9b7d1cd [Glitch] When sending a toot, ensure a CW is only set if the CW field is visible 
Partial port of ccc7fe3e1d to glitch-soc

It doesn't ensure the field isn't changed, just that it isn't submitted if
the field isn't visible. Ensuring the field isn't changed would require
reworking the “always show CW field” feature.
 2019-06-30 14:35:03 +02:00
ThibG
cbb41e2dad [Glitch] Optimize makeGetStatus 
Port f895bf1984 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-30 11:06:04 +02:00
ThibG
46829e009e [Glitch] Use ScrollToOptions for smooth scrolling if supported 
Port 84ff393842 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-30 11:01:01 +02:00
Thibaut Girka
c5495a448c Merge branch 'master' into glitch-soc/merge-upstream 2019-06-30 10:59:45 +02:00
ThibG
f895bf1984 Optimize makeGetStatus (#11211) 
* Optimize makeGetStatus

Because `ImmutableList.filter` always returns a new object and `createSelector`
memoizes based on object identity, the selector returned by `makeGetStatus`
would *always* execute.

To avoid that, we wrap `getFilters` into a new memoizer that memoizes based on
deep equality, thus returning the same object as long as the filters haven't
changed, allowing the memoization of `makeGetStatus` to work.

Furthermore, we memoize the compiled regexs instead of recomputing them each
time the selector is called.

* Fix memoized result being cleared too often

* Make notifications use memoized getFiltersRegex
 2019-06-30 00:12:38 +02:00
ThibG
ccc7fe3e1d When sending a toot, ensure a CW is only set if the CW field is visible (#11206) 
In some occasions, such as the browser or a browser extension auto-filling
the existing but disabled/hidden CW field, a CW can be set without the user
knowing.
 2019-06-29 18:32:36 +02:00
ThibG
84ff393842 Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
ThibG
98c2d2aa46
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-28 22:35:54 +02:00
Eugen Rochko
662252c8f7 [Glitch] Add categories for custom emojis 
Port front-end changes from e64e6a03dd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-28 21:42:37 +02:00
ThibG
4d964398de [Glitch] Fix swiping columns on mobile sometimes failing 
Port 072158ee97 to glitch-soc
 2019-06-28 21:38:34 +02:00
Thibaut Girka
3922b518f7 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 21:36:50 +02:00
ThibG
4f5b221be2 Display FTS warning based on actual search term, not the one being typed (#11202) 
Follow-up to #11112
 2019-06-28 19:29:11 +02:00
ThibG
f7c0e326ab
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-28 19:11:06 +02:00
ThibG
43698e08ca [Glitch] Add message telling FTS is disabled when no toot can be found because of this 
Port ca8944728f to glitch-soc
 2019-06-28 18:54:56 +02:00
Eugen Rochko
e64e6a03dd
Add categories for custom emojis (#11196) 
Fix #7940
 2019-06-28 15:54:10 +02:00
ThibG
072158ee97 Fix swiping columns on mobile sometimes failing (#11200) 
Fixes #9779
 2019-06-28 13:52:15 +02:00
Thibaut Girka
c8ba75b963 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 12:11:45 +02:00
Thibaut Girka
6ad870a410 Change search components classes and styling to match upstream 2019-06-28 11:13:41 +02:00
ThibG
ca8944728f Add message telling FTS is disabled when no toot can be found because of this (#11112) 
* Add message telling FTS is disabled when no toot can be found because of this

Fixes #11082

* Remove info icon and reword message
 2019-06-27 21:12:26 +02:00
ThibG
9a90ec3b3b Fix account URI in UpdatePollSerializer (#11194) 
* Fix account URI in UpdatePollSerializer

Fixes #11185

* Add specs
 2019-06-27 19:41:55 +02:00
Thibaut Girka
ca17bae904 Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
ThibG
2f95adc06f
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-27 16:43:55 +02:00
Thibaut Girka
6ab7051b48 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-27 15:48:23 +02:00
mayaeh
a02f4b7cd4 Fix NameError (#11192) 2019-06-27 09:16:55 +02:00
ThibG
4175f13155 [Glitch] Add option to disable blurhash previews 
Port 3086c645fd to glitch-soc
 2019-06-26 23:19:26 +02:00
PatOnTheBack
383136d9bb [Glitch] Removed extra pipes from regex. 
Port 5b20284f6f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-26 23:19:26 +02:00
ThibG
5c3171e8ea [Glitch] Apply filters to poll options in WebUI 
Port 47ef4a6c7a to glitch-soc
 2019-06-26 23:19:26 +02:00
Thibaut Girka
aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
 2019-06-26 23:19:22 +02:00
ThibG
3086c645fd Add option to disable blurhash previews (#11188) 
* Add option to disable blurhash previews

* Update option text

* Change options order
 2019-06-26 19:33:04 +02:00