Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix relationship caches being broken as result of a follow request #12299

Merged
merged 1 commit into from
Nov 7, 2019

Conversation

ClearlyClaire
Copy link
Contributor

@ClearlyClaire ClearlyClaire commented Nov 4, 2019

When accepting or rejecting a follow request, the RelationshipPresenter would receive strings as account identifiers. This would cause it to call Account.following_map etc. just fine, but those would use an integer as key, while cache_uncached! would use a string as the key and thus get and save nil.

This PR makes sure every id is actually an integer.

@Gargron Gargron merged commit 514e427 into mastodon:master Nov 7, 2019
doubanius pushed a commit to doubanius/mastodon that referenced this pull request Nov 10, 2019
* Bump @babel/preset-react from 7.0.0 to 7.6.3 (mastodon#12315)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.0.0 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](babel/babel@v7.0.0...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump sass from 1.23.1 to 1.23.3 (mastodon#12314)

Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](sass/dart-sass@1.23.1...1.23.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump glob from 7.1.4 to 7.1.5 (mastodon#12312)

Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](isaacs/node-glob@v7.1.4...v7.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (mastodon#12311)

Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.0.0-beta.2.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](naptha/tesseract.js@v2.0.0-alpha.16...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/preset-env from 7.6.0 to 7.7.1 (mastodon#12318)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](babel/babel@v7.6.0...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @babel/runtime from 7.6.0 to 7.7.1 (mastodon#12317)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.6.0 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.7.1/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump sass-loader from 7.1.0 to 8.0.0 (mastodon#12027)

* Bump sass-loader from 7.1.0 to 8.0.0

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/sass-loader@v7.1.0...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* bump webpack

* Fix various issues with account migration (mastodon#12301)

* Fix being able to follow oneself by moving to an account that was following the old one

* Add specs

* Add spec to catch MoveWorker issue with local followers following both accounts

* Fix move worker breaking when a local account follows both source and target accounts

* Fix migration from remote to local account not sending Undo Follow

* Fix show_reblogs not being preserved for moved account's followers

* Minor improvements to poll composing UI (mastodon#12319)

- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width

* Fix WebUI allowing to upload more items than the limit (mastodon#12300)

Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.

* Fix relationship caches being broken as result of a follow request (mastodon#12299)

* Fix type mismatch (mastodon#12324)

This was [causing an issue with feed regeneartion in tootctl](hometown-fork#24), and @davefp fixed the issue.

* Fix win95 profile page style

* Increase profile page max width

* Revert "Increase profile page max width"

This reverts commit 4b10c37.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants