Daily use 37b: Composer barriers and blocked-message groups (#528) #592
Closed
charles
wants to merge 0 commits from
dailyuse-37b-ui-composer-barriers-blocked into dailyuse
pull from: dailyuse-37b-ui-composer-barriers-blocked
merge into: charles:dailyuse
charles:main
charles:camera
charles:dailyuse
charles:textchat
charles:fix-1008-idle-in-voice
charles:camera-21-acceptance
charles:feat-1000-app-sounds-output
charles:fix-1001-local-time
charles:camera-20-parity-list-for-the
charles:fix-931-silent-voices
charles:camera-15-ui-settings-voice-video
charles:camera-14-ui-camera-buttons-camera
charles:camera-16-ui-layout-with-cameras
charles:camera-17-core-toggle-camera-shortcut
charles:camera-13-ui-mirrored-video-and
charles:camera-12-appsfluxer-camera-runtime-and
charles:camera-10-capture-camera-on-linux
charles:camera-11-capture-camera-on-windows
charles:camera-9-voice-the-camera-track
charles:camera-7-core-the-own-camera
charles:camera-6-capture-camera-trait-mode
charles:camera-8-core-remote-cameras-tile
charles:camera-3-spike-a-camera-track
charles:camera-4-video-camera-formats-and
charles:camera-18-devserver-camera-scenario
charles:camera-1-spike-capture-linux
charles:camera-5-core-camera-ports-commands
charles:camera-2-spike-capture-windows
charles:camera-plan
charles:shell
charles:fix-925-keybinds-persist
charles:feat-934-935-stream-view
charles:feat-933-stream-output-device
charles:shell-44-acceptance
charles:feat-946-select-message-text
charles:shell-43-parity-list-for-the
charles:fix-589-black-band-linux-sender
charles:shell-37-ui-system-wide-shortcuts
charles:shell-ship
charles:fix-931-voices-silent-after-long-uptime
charles:shell-39-ui-settings-notifications
charles:shell-36-ui-settings-keybinds
charles:shell-16-core-autostart
charles:fix-923-late-publication-next-share
charles:fix-921-share-teardown-publish-race
charles:shell-1-spike-iced-daemon-hide
charles:shell-10-core-instance-messages-tasks
charles:shell-11-core-keybinds-actions-combos
charles:shell-13-core-badge-attention-sound
charles:shell-14-core-notification-settings-inactive
charles:shell-18-platform-desktop-entry-and
charles:shell-2-spike-tray-on-linux
charles:shell-3-spike-wayland-global-shortcuts
charles:shell-41-devserver-shell-scenario
charles:shell-5-spike-overlay-technique-for
charles:shell-6-core-shell-ports-settings
charles:shell-7-platform-settings-shell-keybinds
charles:shell-8-core-tray-model-and
charles:shell-9-core-window-rules-close
charles:fix-913-keep-awake-retry
charles:shell-35-ui-in-window-voice
charles:shell-sync-textchat
charles:shell-34-app-shortcuts-runtime
charles:fix-913-keep-screen-awake
charles:fix-910-deepfilter-windows-timing
charles:shell-33-app-shell-runtime
charles:shell-28-platform-shortcuts-on-wayland
charles:fix-910-deepfilter-late-frame
charles:shell-29-platform-shortcuts-by-direct
charles:shell-27-platform-shortcuts-on-x11
charles:shell-17-platform-single-instance
charles:shell-24-platform-badge-displays-and-24
charles:shell-26-platform-shortcuts-on-windows
charles:shell-21-platform-tray-on-linux
charles:shell-22-platform-tray-on-windows
charles:fix-908-flaky-stream-end-test
charles:shell-30-platform-wayland-activation
charles:shell-38-ui-settings-desktop
charles:shell-19-platform-autostart
charles:shell-25-platform-shortcut-back-end
charles:shell-23-platform-badge-displays-and
charles:shell-40-ui-companion-apps-control
charles:shell-31-statusapi-default-avatars
charles:shell-12-core-system-wide-shortcut
charles:shell-20-platform-tray-trait-icons
charles:shell-32-ui-daemon-window-lifecycle
charles:shell-4-spike-raising-a-wayland
charles:shell-15-core-status-payload-gaps
charles:fix-876-share-resolution-and-bars
charles:shell-42-packaging-windows-shortcuts-and
charles:fix-874-tests-must-not-notify
charles:fix-868-deepfilternet-start
charles:gamenight-plan
charles:fix-867-869-stream-end-soundboard-limits
charles:feat-229-windows-hardware-encoding
charles:fix-857-vaapi-hardware-encoding
charles:fix-849-inert-cards
charles:fix-848-pinned-messages-clickable
charles:shell-plan
charles:fix-764-nvenc-above-720p30
charles:serveradmin
charles:feat-780-forum-archived-filter
charles:serveradmin-35-acceptance
charles:feat-781-no-join-chime-with-entrance-sound
charles:feat-784-rejoin-voice-after-update
charles:fix-779-782-search-dropdown-paste-preview
charles:fix-783-781-dm-rail-entrance-sound
charles:serveradmin-34-parity-screenshots
charles:serveradmin-31-ui-channel-permissions
charles:fix-773-cargo-deny-advisories
charles:serveradmin-33-ui-sudo-delete-transfer
charles:serveradmin-28-ui-members-page
charles:serveradmin-26-ui-role-permissions
charles:serveradmin-30-ui-voice-overview-channel-invites
charles:serveradmin-fix-27-29
charles:serveradmin-25-ui-roles-tab
charles:serveradmin-27-ui-menus-moderation-modals
charles:serveradmin-29-ui-channel-settings
charles:fix-589-stream-top-strip-encode
charles:serveradmin-24-ui-moderation-invites-bans
charles:feat-760-version-in-title
charles:fix-751-stream-audio-pipewire
charles:serveradmin-20-core-menu-rows
charles:fix-752-linux-notification-panic
charles:serveradmin-17-core-overrides
charles:fix-740-updater-always-latest
charles:serveradmin-23-ui-community-settings-overview
charles:serveradmin-12-core-roles
charles:serveradmin-19-core-sudo-delete-transfer
charles:serveradmin-32-ui-sidebar-drag
charles:serveradmin-15-core-members-page
charles:serveradmin-16-core-channel-settings
charles:serveradmin-14-core-bans-invites
charles:fix-615-restore-on-stored-session-start
charles:serveradmin-22-runtime
charles:serveradmin-13-core-member-moderation
charles:serveradmin-18-core-channel-reorder
charles:fix-732-status-api-speaking
charles:serveradmin-10-core-permission-lists
charles:serveradmin-11-core-forms-community
charles:serveradmin-21b-devserver-channels-members-sudo
charles:serveradmin-4-api-community-roles-sudo
charles:serveradmin-9b-core-hierarchy-bulk-events
charles:serveradmin-21a-devserver-community-roles
charles:serveradmin-9a-core-ports
charles:serveradmin-8-form-widgets
charles:serveradmin-5-api-channels-members-bans
charles:serveradmin-7-settings-shell
charles:serveradmin-1-proto-community-roles
charles:serveradmin-3-proto-members-bans-invites
charles:serveradmin-6-reorder-widget
charles:serveradmin-2-proto-channel-admin
charles:fix-706-presence-after-reconnect
charles:fix-615-start-on-last-view
charles:feat-663-create-channel
charles:serveradmin-plan
charles:fix-662-long-text-wrap
charles:fix-660-661-menu-toolbar-paste-focus
charles:fix-620-forum-list-reactions
charles:fix-657-windows-console
charles:fix-622-emoji-in-names
charles:fix-smoke-645-648
charles:fix-614-install-location
charles:dailyuse-41-acceptance
charles:fix/597-copy-id
charles:dailyuse-40-parity-screenshots
charles:dailyuse-35-ui-quick-switcher-keybinds
charles:dailyuse-38-ui-profile-modal
charles:fix/voice-view
charles:fix/side-panel-composer
charles:fix/image-viewer
charles:fix/619-picker-flicker
charles:fix/editor-forum-edit
charles:dailyuse-32-ui-status-picker
charles:dailyuse-34b-ui-add-guild-invite-modal
charles:dailyuse-28-app-dailyuse-runtime
charles:dailyuse-36-ui-voice-badge-refusals
charles:fix/594-menu-placement-textchat
charles:fix/589-stream-top-strip
charles:fix/594-menu-placement
charles:dailyuse-39-ui-report-modal
charles:dailyuse-37a-ui-attachment-audio-group-icon
charles:dailyuse-24-core-notification-icon-passive
charles:fix/587-quiet-voice
charles:dailyuse-30-ui-notification-settings-modal
charles:dailyuse-31-ui-user-dm-menus
charles:dailyuse-22b-core-composer-barriers-blocked
charles:dailyuse-22a-core-mark-unread-attachments
charles:dailyuse-29-ui-channel-guild-menus
charles:dailyuse-18-core-user-dm-menus
charles:dailyuse-33-ui-confirm-friends-page
charles:dailyuse-22c-core-trusted-domains-hide-muted
charles:dailyuse-20-core-keyboard-navigation
charles:dailyuse-15-core-friends-blocking
charles:dailyuse-23-core-profile-report-flow
charles:dailyuse-19-core-quick-switcher
charles:dailyuse-14-core-status-idle-presence
charles:dailyuse-17-core-channel-guild-menus
charles:ci/27-linux-cache
charles:dailyuse-37c-ui-trust-links-hide-muted
charles:dailyuse-13-core-honour-mutes
charles:dailyuse-34a-ui-invite-cards-accept
charles:dailyuse-16b-core-create-invites-guilds
charles:dailyuse-12-core-notification-settings-mutes
charles:dailyuse-16a-core-invite-links
charles:dailyuse-25-audio-attachments
charles:dailyuse-21-core-voice-refusals
charles:dailyuse-11b-core-state-skeleton
charles:dailyuse-11a-core-dailyuse-ports
charles:dailyuse-26b-devserver-dailyuse-b
charles:dailyuse-26a-devserver-dailyuse-a
charles:dailyuse-4-api-settings-acks-reports
charles:dailyuse-5-api-relationships-invites-guilds
charles:dailyuse-27-platform-notification-idle
charles:dailyuse-10-highlight-languages
charles:fix-search-focus-hover-emoji
charles:dailyuse-8-context-menu-widget
charles:dailyuse-9-image-load-retry
charles:dailyuse-7-chat-navigation-persistence
charles:dailyuse-2-proto-relationships-invites-reports
charles:dailyuse-1-proto-notification-presence
charles:dailyuse-6-gateway-op12-presence
charles:textchat-next
charles:fix-stream-black
charles:fix-reactions-hover
charles:textchat-68-app-video-playback-runtime
charles:textchat-35-acceptance
charles:textchat-34-parity-screenshots
charles:textchat-74-app-updater-runtime
charles:textchat-67-ui-video-player
charles:textchat-stage-46-47
charles:textchat-47-ui-media-channel
charles:textchat-75-promote-stable-workflow
charles:textchat-46-ui-forum-composer
charles:textchat-73-ui-update-button
charles:textchat-64-media-playback-crate
charles:textchat-stage-43-48
charles:textchat-72-platform-updater
charles:textchat-44-ui-thread-view
charles:textchat-70-release-update-feed
charles:textchat-48-ui-announcements
charles:textchat-45-ui-forum-view
charles:textchat-71-core-updater
charles:textchat-43-ui-sidebar-links-notes
charles:textchat-stage-40
charles:textchat-42-app-channel-types-runtime
charles:textchat-39-core-forums
charles:textchat-40-core-announcements-thread-admin
charles:textchat-60-ui-entrance-sounds
charles:textchat-63-ffmpeg-lgpl-packaging
charles:textchat-stage-batch6
charles:textchat-69-proto-update-manifest
charles:textchat-61-app-soundboard-entrance-runtime
charles:textchat-52-app-audio-devices-runtime
charles:textchat-38-core-channel-routing
charles:soundboard-effect-emoji
charles:status-api-rebind
charles:textchat-28-ui-gif-picker
charles:textchat-41-devserver-channel-types
charles:voice-panel-soundboard
charles:textchat-29-ui-message-actions
charles:textchat-37-api-channel-types
charles:textchat-66-core-video-players
charles:autoupdate-plan
charles:textchat-33-ui-message-list-settings
charles:textchat-32-ui-dms
charles:textchat-62-rename-flaxative
charles:fix-chatcolumn-tree
charles:textchat-65-audio-media-source
charles:textchat-31-ui-threads
charles:textchat-stage-27
charles:textchat-30-ui-search-pins-inbox
charles:textchat-53-ui-audio-sources-menu
charles:textchat-27-ui-expression-picker
charles:textchat-57-core-entrance-library
charles:textchat-36-proto-channel-types
charles:textchat-26-ui-upload-tray
charles:textchat-59-ui-soundboard-popout-parity
charles:textchat-58-audio-sound-edit
charles:textchat-55-proto-api-entrance-library
charles:textchat-25-ui-composer
charles:textchat-56-core-soundboard-parity
charles:rename-video-plan
charles:textchat-stage-25
charles:textchat-stage-23-24
charles:soundboard-plan
charles:textchat-24-ui-message-row
charles:textchat-22-ui-attachments-media
charles:textchat-23-ui-embeds
charles:textchat-14-core-expressions
charles:textchat-21-app-textchat-runtime
charles:textchat-16-core-navigation-read
charles:textchat-17-core-search
charles:textchat-19-core-dms-settings
charles:textchat-stage-13-15-18
charles:textchat-54-livekit-stereo-audio
charles:textchat-50-core-stream-audio-sources
charles:textchat-12-core-uploads
charles:textchat-15-core-message-actions
charles:textchat-11-core-composer
charles:textchat-18-core-threads
charles:textchat-13-core-reactions
charles:textchat-51-audio-pipewire-devices
charles:textchat-49-capture-audio-targets
charles:audio-plan
charles:textchat-plan2
charles:textchat-20-devserver-textchat
charles:textchat-6-api-chat-endpoints
charles:textchat-10-core-chat-ports
charles:textchat-9-ui-code-highlighting
charles:textchat-3-proto-expressions-threads-prefs
charles:textchat-5-api-messages-uploads
charles:textchat-2-proto-chat-requests-events
charles:textchat-8-ui-inline-flow-emoji
charles:screenshare
charles:textchat-7-platform-files-clipboard
charles:textchat-1-proto-message-content
charles:textchat-4-emoji-crate
charles:screenshare-31-acceptance
charles:screenshare-29-parity-screenshots
charles:textchat-plan
charles:screenshare-24-ui-focus-layout
charles:screenshare-27-ui-stream-menu
charles:screenshare-30-packaging-ci
charles:screenshare-21-app-screenshare-runtime
charles:screenshare-22-ui-sidebar-live
charles:screenshare-23-ui-stream-tile
charles:screenshare-26-ui-source-picker
charles:screenshare-28-ui-screenshare-settings
charles:screenshare-13-core-previews
charles:screenshare-12-core-codec-negotiation
charles:screenshare-25-ui-share-controls
charles:screenshare-18-hw-encode-linux
charles:screenshare-19-spike-hw-encode-windows
charles:screenshare-11-core-stream-params
charles:screenshare-20-devserver-screenshare
charles:screenshare-10-core-go-live
charles:screenshare-17-voice-livekit-video
charles:screenshare-14-audio-capture-linux
charles:wip/screenshare-17
charles:screenshare-integration
charles:feat-user-profile
charles:fix-voice-join
charles:feat-entity-images
charles:screenshare-16-voice-video-session
charles:screenshare-9-core-watching
charles:screenshare-5-capture-windows
charles:fix-wire-livekit
charles:screenshare-4-capture-linux
charles:screenshare-15-audio-capture-windows
charles:fix-member-list
charles:screenshare-8-core-stream-ports
charles:fix-live-protocol
charles:screenshare-6-ui-video-widget
charles:screenshare-3-capture-crate
charles:fix-altcha-captcha
charles:screenshare-1-video-frames
charles:screenshare-7-proto-api-streams
charles:screenshare-2-spike-livekit-video
charles:voice
charles:voice-26-acceptance
charles:voice-23-voice-e2ee
charles:voice-25-packaging-ci
charles:voice-13-voice-livekit-interop
charles:voice-24-parity-screenshots
charles:voice-19-ui-soundboard
charles:voice-20-ui-participant-menu
charles:voice-22-ui-dm-calls
charles:voice-21-ui-voice-settings
charles:voice-18-ui-call-view
charles:voice-14-app-voice-runtime
charles:voice-10-core-soundboard
charles:voice-17-ui-voice-panel
charles:voice-9-core-voice-settings-advert
charles:voice-5-audio-clips-chimes
charles:voice-15-devserver-voice
charles:voice-8-core-live-room-volumes
charles:voice-11-core-calls-status
charles:voice-12-voice-session
charles:voice-4-audio-devices-mixer
charles:voice-16-ui-voice-sidebar
charles:voice-7-core-voice-connection
charles:foundation
charles:voice-2-proto-api-soundboard-rtc
charles:voice-6-core-voice-states
charles:voice-3-audio-dsp
charles:voice-1-proto-voice-gateway
charles:task/26-acceptance
charles:task/25-packaging-release
charles:task/24-screenshot-tests
charles:task/20-ui-message-list-composer
charles:task/22-ui-settings-parity
charles:task/18-ui-main-layout
charles:task/23-notifications
charles:task/17-ui-shell-login
charles:task/14-app-runtime
charles:ci/51-windows-disk-space
charles:task/12-platform-persistence
charles:task/13-devserver
charles:task/21-ui-avatar-image-cache
charles:task/10-core-messages-readstate
charles:task/9-core-guilds-channels
charles:task/7-gateway-machine-transport
charles:task/11-core-presence-ui
charles:task/19-ui-rich-text
charles:task/8-core-store-session
charles:task/16-ui-theme-fonts-icons
charles:task/15-status-api
charles:task/4-proto-gateway-events
charles:task/5-openapi-vendor-contract
charles:task/6-api-client
charles:task/3-proto-rest-models
charles:task/2-proto-primitives
charles:task/1-workspace-scaffold
No reviewers
Labels
Clear labels
bug
A bug found while working on something else; steps to reproduce and the commit seen on
ci
Build, CI runners and workflows
follow-up
Deferred reviewer finding, linked from the PR it came from
good-first-task
Small, well-scoped, no cross-crate knowledge needed
parity
Settings/behaviour parity with the Electron client
question
Design question that needs Charles; blocks its task until answered
ready-to-merge
Reviewer approved, foundation merged in, CI green on both runners; waiting for the orchestrator to merge
task
A plan task (one per Foundation plan task)
No labels
bug
ci
follow-up
good-first-task
parity
question
ready-to-merge
task
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".
No due date set.
Dependencies
No dependencies set.
Reference
charles/fluxer-native!592
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "dailyuse-37b-ui-composer-barriers-blocked"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Stacked on: dailyuse-22b-core-composer-barriers-blocked, dailyuse-31-ui-user-dm-menus
What this builds (spec §3.9, #400)
screens/main/composer/barrier.rs, cloned frombarriers/BarrierComponents.{tsx,module.css}): from the core'scomposer_barrier, a bar in the composer's box replaces it: blocked DM ("You have blocked {username}. Unblock them to send messages." + Unblock, which unblocks at once asunblockUserdoes), system DM, timeout (with theM:SScountdown,.timerstyling), announcement without SEND_MESSAGES ("Follow"). New Phosphor iconsTimerandMegaphoneSimple(fill). Without SEND_MESSAGES the composer stays, disabled, with "You can't send messages in this channel.". A locked thread keeps the existing thread notice in the composer's place.ComposerOptionsfrom the core's context:composer::options(&App, channel)/ComposerOptions::from_context(&ComposerContext)replaceComposerOptions::default()incomposer::{update, wanted, wanted_animated},messages::{model, view_with_media}and the main screen's plus menu.widgets/message_list/blocked_group.rs,BlockedMessageGroups.{tsx,module.css}): the message view now uses the core'smessage_list(MessageListItem); a group row "{count} blocked message(s)" on--background-secondary, a click sendsRevealBlockedGroup(reveals, or hides when revealed, likeonReveal(null)).MessagesModelgainsblocked_groups.Tests
tests/composer_barriers.rs:barrier_variants,composer_options_from_context.tests/message_list.rs:blocked_group_row_reveals(thedailyusehistory: mallory's 2 + 1 messages).composer_blocked_barrier,composer_no_permission,message_list_blocked_group; references indocs/screenshots/.FLUXER_SCREENSHOT_TESTS=1 cargo xtask cigreen locally. NoFLUXER_DESKTOP_TESTStests are involved.Deviations / notes for review
widgets/message_list.rschanges more than amodline: the widget's item type moved fromTimelineItemtoMessageListItem(aRowKey::BlockedGroupkey, measured as a non-message row). This is needed for the group row to exist in the virtualised list.--background-secondaryshading; the original also shades the revealed messages (.container). The countdown updates when the view redraws.threads/panel.rsandforum/composer.rs(outside this task's files) still set up their own options.BarrierComponents.module.css,BlockedMessageGroups.module.cssandglobals.css(--textarea-*).Closes #528
Closes #400
🤖 Generated with Claude Code
Uses the existing server-shaped fixtures: rest/invite_metadata.json (POST /channels/{id}/invites, S/invite/InviteSchemas.ts:42-91 plus the metadata fields), rest/guild.json (POST /guilds, GuildResponse) and gateway/guild_create.json. Refs #502 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>Table tests for the notification decision (Notification.ts:187-256) and tests for mute consumers: unread, guild pill, hide muted channels, DM mentions. Stubs for SidebarSection.{category_muted,muted} and notif_settings::hides_muted_channels so the tests compile. Refs #498 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>menus::{channel, category, guild} build the original's desktop menus (AM/ChannelContextMenu.tsx, ChannelMenuData.tsx:429-632, CategoryMenuData.tsx:263-339, GuildMenuData.tsx:314-497) with the "B" rows of spec 3.2 (a)-(d). MarkCategoryRead and MarkGuildRead ack in bulk through POST /read-states/ack; CopyId, CopyChannelLink and the link channel's "Copy link" write the clipboard. Collapsed categories are synced as the category override's `collapsed` (UserGuildSettingsCommands.ts:198-246), written debounced 3 s with the whole override map; "Hide muted channels" likewise. The sidebar reads notif_settings::is_collapsed and emits UserAction::ToggleCategory instead of keeping a local set. New UserAction variants: CopyLinkChannelUrl, OpenNotificationSettings, OpenFollowChannel (the last two open UI-owned modals). Refs #503 Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>A right press on a member row, a message author's avatar or name, a user mention or a DM row opens the user, member or DM menu that fluxer_core::menus builds (spec 3.2 (e), (f)). Relationship rows ask through the generic confirm; Shift sends them confirmed only where social::confirm_rule lets it (block, unblock, remove, accept), never for Close DM, Open DM or Leave group. "Change friend nickname" opens its modal ("Change nickname", "Clear nickname", 32 characters). The voice participant menu gains Mention and Message from the same builder (#476). Refs #520 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>- composer::barrier: the bar that replaces the composer (BarrierComponents.{tsx,module.css}): blocked DM with Unblock, system DM, timeout with its M:SS countdown, announcement Follow; the Timer and MegaphoneSimple icons. Without SEND_MESSAGES the composer stays, disabled, with "You can't send messages in this channel.". - composer::options / ComposerOptions::from_context: the channel composer's options from the core's composer_context instead of ComposerOptions::default() (composer update/wanted, messages model and view, the main screen's plus menu). - widgets::message_list over MessageListItem; message_list::blocked_group draws "{count} blocked messages" (BlockedMessageGroups.module.css), a click sends RevealBlockedGroup (reveal, or hide when revealed). Refs #528 Refs #400 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>Independent review: Daily use 37b (reviewed cold, diff 765bb43e..8f48edb)
Verdict: changes requested (1 blocking, 3 minor).
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ciis green on8f48edb(EXIT=0, run locally in the review worktree).Checked and OK
barrier_variants,composer_options_from_context(tests/composer_barriers.rs) andblocked_group_row_reveals(tests/message_list.rs) exist and assert the spec §3.9 strings exactly ("You have blocked {username}. Unblock them to send messages.", "System announcements from Fluxer staff. You can't reply here.", the timeout text, "You can't send messages in this channel.", "1 blocked message" / "2 blocked messages", M:SS "2:05"). The goldenscomposer_blocked_barrier,composer_no_permissionandmessage_list_blocked_groupare in screenshots.rs, fixtures/golden and docs/screenshots.composer_barrier/Barrier/BarrierAction/composer_context/message_list_with_offset/MessageListItem::BlockedGroup/RevealBlockedGroupas they are on the base. EveryComposerOptions::default()the plan names (composer update/wanted, messages model/view, main mod.rs) is replaced.BarrierComponents.tsx: icons Prohibit/Info/Timer/MegaphoneSimple (fill), Unblock isButton small(primary), Follow isvariant="secondary", the countdown is shown only when the remaining time is > 0, andformatTimerounds up. All match. (2)unblockUser(RelationshipActionUtils.tsx:309) callsremoveRelationshipwith no confirm, which matchesconfirmed: true(Review Focus 5). (3)BlockedMessageGroups.tsx: the plural descriptor matches, and the.toggle0.75rem/500 weight, 0.25rem 1rem padding, text-primary-muted with text-secondary on hover, and--background-secondarymatch the CSS. (4).icon svguses--textarea-button-icon-size(22px), so it overridesremFromPx(18). The native size is correct.messages.rsis the onlyMessageList::newcaller, so no other task's interface breaks.Findings
composer/barrier.rsreadsremaining_msonce per view, andapp.rssubscription()has no timer while aBarrier::TimedOutshows (window::framesruns only for animations). So "2:05" stays on screen until some unrelated message causes a redraw, and when the timeout expires the barrier stays and the user cannot type until something else redraws. In the original,CountdownTimer(BarrierComponents.tsx:103-118) ticks every 1000 ms, and spec §3.9 requires the M:SS countdown. The 22b core doc also says "the UI counts it down". Fix: whilecomposer_barrierisTimedOutfor the open channel, run a 1 s subscription (theRetryAt/retry_duethread-timer pattern in app.rs works on iced's executor). Add a test that the subscription is active only in that state..containershades the revealed messages as well as the toggle. The PR discloses this. Track it as a follow-up issue.ComposerOptions, so a timeout barrier does not replace the thread panel's composer. Those files are outside this task's list; open a follow-up issue linked from this PR.Verdict: changes requested. Fix finding 1, then this is ready.
Second independent review: Daily use 37b (reviewed cold, own diff 765bb43e..8f48edb3)
Verdict: changes requested (1 blocking, 2 minor).
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ciis green on8f48edb3(EXIT=0, "all steps passed"). The three goldens ran on Vulkan and passed. They were not skipped.The head has not changed since comment 6726. This review was done separately, and it reaches the same blocking finding.
Checked and OK
barrier_variantsandcomposer_options_from_context(tests/composer_barriers.rs), andblocked_group_row_reveals(tests/message_list.rs), are present and pass. They assert the spec §3.9 strings exactly. The goldenscomposer_blocked_barrier,composer_no_permissionandmessage_list_blocked_groupare in screenshots.rs, fixtures/golden and docs/screenshots.composer_barrier,BarrierandBarrierAction, and the options fromcomposer_context. The group row usesMessageListItem::BlockedGroupandRevealBlockedGroupas they are on the base. All fiveComposerOptions::default()sites named in the plan are replaced.TimelineItembecomesMessageListIteminwidgets/message_list.rs, which is more than amodline.messages.rsis the only caller, so no other task's interface breaks.BlockedMessageGroups.tsx: the plural descriptor matches. A click on a revealed group sendsonReveal(null), otherwise the group's first id. The.toggleCSS matches: 0.75rem, weight 500, padding 0.25rem 1rem, text-primary-muted with text-secondary on hover, on--background-secondary.BarrierComponents.tsx: the icons are Prohibit, Info, Timer and MegaphoneSimple. Unblock isButton smalland Follow issecondary small. The countdown shows only when time remains, rounded up. The.icon svgsize comes from--textarea-button-icon-sizeand overridesremFromPx(18).unblockUser(RelationshipActionUtils.tsx:309) does not confirm, which matchesconfirmed: true(Review Focus 5).Findings
barrier::modelreadsremaining_msfrom the core's wall clock (notif_settings.now()) only when the view is built. WhileBarrier::TimedOutshows,App::subscription(crates/fluxer-ui/src/app.rs, about line 855) runs no timer.window::framesruns only for animations, videos and the update button.CountdownTimer(BarrierComponents.tsx:103-118) ticks every 1000 ms, and spec §3.9 requires the countdown.composer_barrierisTimedOut, for example on theRetryAt/retry_duepattern. Add a test that it runs only in that state..containerputs--background-secondarybehind the revealed messages too. The PR discloses this. Track it as a follow-up.ComposerOptions. Those files are outside this task's list. Open a follow-up issue.Verdict: changes requested. Fix finding 1, and the rest can be approved.
Fix for the review's blocking finding (the timeout countdown never redrew), head
72ca9d26.What changed
crates/fluxer-ui/src/screens/main/composer/barrier.rs:75countdown(&App, channel) -> Option<Timestamp>: when the timeout ends, but only while the timeout bar shows over that channel's composer (Nonefor every other bar).barrier.rs:85until_next_second(remaining_ms) -> Duration: how long until the shown whole seconds change. It rounds up, as the original'sMath.ceilinCountdownTimerdoes (BarrierComponents.tsx:103-131, "M:SS", which the core'scountdownalready matched).crates/fluxer-ui/src/app.rs:311-335,946: aSubscription::run_with(CountdownUntil(until), countdown_ticks)that exists only while the open channel shows the timeout bar, so there are no idle wake-ups otherwise. Its thread wakes just after each second boundary and once more just after the timeout ends. Each wake sendsUiMessage::BarrierTick(message.rs:34), which redraws: the core re-reads the clock, so the M:SS counts down and the bar lifts at the end, which brings the composer back.timeout_countdown_ticks(tests/composer_barriers.rs:235): no timer without a timeout or over the blocked DM's bar. With a timeout the timer is due atuntil, and the wake-ups fall on second boundaries. Moving the clock forward shows "2:04" and then "0:01". Atuntilthe bar and the timer are gone and the composer returns, enabled, without the "can't send" placeholder. Without the fix this test does not compile, because the functions it calls do not exist.Merge of origin/dailyuse
Conflicts and how they were resolved:
megaphone-simple-fill.svg: the two sides differed only by a trailing newline; dailyuse's copy is kept.theme/icons.rs: both sides addedMegaphoneSimple, so the duplicate is merged into one variant whose comment covers both uses.crates/fluxer-ui/README.md: the settings line is dailyuse's; the message_list line is this branch's.docs/screenshots/README.mdandtests/screenshots.rs: both sides kept.app.rsandmessage.rs:ToastDueandBarrierTickare both kept.The
message_list_blocked_groupgolden was redrawn on lavapipe. The merged invite cards (still loading) now appear above the groups in the shared history. The groups themselves are unchanged, and the README row is updated.Gate:
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ciends with "xtask ci: all steps passed".Not verified: the live ticking was not watched in the running app; only the model and the timer's schedule are tested. The plan's other requirements for this task are present:
barrier_variants,composer_options_from_context,blocked_group_row_revealsand the three goldens.Merged into
dailyuseandtextchatatc7601011(combined merge).Pull request closed