Merge upstream changes - Githubissues

polyamspace / mastodon

Custom Mastodon fork used by https://polyam.space

GNU Affero General Public License v3.0

1 stars 2 forks source link

Merge upstream changes #563

Closed polyamAdmin closed 1 month ago

polyamAdmin commented 1 month ago

Conflicts:

app/javascript/flavours/glitch/actions/interactions.js
app/javascript/flavours/glitch/reducers/statuses.js Upstream deleted code close to code added for reactions. Deleted code upstream did.

Ported changes:

15d307075479cf93ea199be0f25820003ddbe27c
10ec421dd4e0da987e69a3dd7f4f696f9c5878e0
b6fd14f0e2842eca269ef8962e3c5bd560a76357

polyamAdmin commented 1 month ago

I'm not sure what it is, but something in this messes with account notes.

When adding an account note, the server responds with a 422, either with an error about account being taken or duplicate record. The note still gets saved though.

I think it's not the frontend changes, but something in the account note model causing the uniqueness validation to fail likely because of a race condition. The frontend changes seemed to make it more likely as I still wasn't able to reproduce it before this change.

polyamAdmin commented 1 month ago

As the issue with notes doesn't seem to affect functionality, I think it's fine to merge and either find a fix or wait for upstream to fix. The issue does appear in the polyam flavour more often than in glitch, but I'm not sure why.