Skip to content

Merge main into prod#5899

Merged
ggurdin merged 2243 commits intoproductionfrom
merge-main-into-prod
Mar 6, 2026
Merged

Merge main into prod#5899
ggurdin merged 2243 commits intoproductionfrom
merge-main-into-prod

Conversation

@ggurdin
Copy link
Collaborator

@ggurdin ggurdin commented Mar 5, 2026

Thank you so much for your contribution to FluffyChat ❤️❤️❤️

Pull Request has been tested on:

  • Android
  • iOS
  • Browser (Chromium based)
  • Browser (Firefox based)
  • Browser (WebKit based)
  • Desktop Linux
  • Desktop Windows
  • Desktop macOS

ggurdin and others added 22 commits February 26, 2026 16:05
* fix: disable activity session start button if not selected role

* chore: always show text 'confirm' on activity session confirm role button
…e been invited" (#5823) (#5835)

* fix: show knock-accepted notification body when invite follows a knock (#5823)

When Synapse accepts a knock it sends an m.room.member invite event. The client
was displaying the generic 'You have been invited by X' push notification body
because the invite event alone doesn't carry prev_content on the push path.

Use KnockTracker (already used for auto-join) to detect knock-accepted invites
and show a dedicated 'Your join request was accepted!' notification body instead.

- Add knockAccepted string to intl_en.arb
- Extract condition into isKnockAcceptedInvite() pure util for testability
- Expose KnockTracker.getKnockedRoomIds() publicly (was _getKnockedRoomIds)
- Override notification body in push_helper.dart (background) and
  local_notifications_extension.dart (foreground/web)
- Unit tests for all isKnockAcceptedInvite() branches (9 tests)

* formatting

* fix up pangea comments

* fix: avoid race condition with knocked room account data updates and local push notification content

* translations

---------

Co-authored-by: ggurdin <ggurdin@gmail.com>
…a/ta (#5858)

* fix: emit granular IGC/IT use types instead of collapsed ga/ta

* formatting

* fix linter issues with deprecated use types

* fix: don't add match viewing update to choreo record, don't flatten token IGC uses into a single type

* break vocabAndMorphUses down into smaller functions

* filter viewed choreo steps when getting uses from choreo

---------

Co-authored-by: ggurdin <ggurdin@gmail.com>
…tions (#5839)

* docs: add User Feedback section to toolbar reading assistance instructions

Describes the shared feedback pattern for word cards (existing) and
translations (planned). References #5838.

* feat: allow users to flag translations

* make flag button smaller

---------

Co-authored-by: ggurdin <ggurdin@gmail.com>
…d custom invite reason for invite-on-knock to trigger custom content in background notifications (#5877)
…request (#5856)

The server derives user identity from the Matrix Bearer token already
sent in the Authorization header. The pangea_user_id query param is
ignored server-side and unnecessary.

Co-authored-by: ggurdin <ggurdin@gmail.com>
Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com>
…#5880)

* fix: on login, don't show invite dialog for previously knocked spaces

* await onTap space

* another fix
…cutoff times for recent practice uses to all target generators (#5889)
@ggurdin ggurdin marked this pull request as draft March 5, 2026 14:07
@ggurdin
Copy link
Collaborator Author

ggurdin commented Mar 5, 2026

@copilot Hey, can you summarize the major changes in this PR that aren't related to the FluffyChat merge?

Copilot AI mentioned this pull request Mar 5, 2026
9 tasks
Copy link

Copilot AI commented Mar 5, 2026

@ggurdin I've opened a new pull request, #5900, to work on those changes. Once the pull request is ready, I'll request review from you.

@ggurdin ggurdin marked this pull request as ready for review March 6, 2026 14:21
@ggurdin ggurdin merged commit 916c9a0 into production Mar 6, 2026
5 of 6 checks passed
@ggurdin ggurdin deleted the merge-main-into-prod branch March 6, 2026 14:22
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.

6 participants