mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 13:23:13 +00:00
Fix firehose not indicating new toots in "All" (#2335)
When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
This commit is contained in:
parent
e69fe94669
commit
feaf3cf780
|
@ -76,12 +76,12 @@ const Firehose = ({ feedType, multiColumn }) => {
|
||||||
const { signedIn } = useIdentity();
|
const { signedIn } = useIdentity();
|
||||||
const columnRef = useRef(null);
|
const columnRef = useRef(null);
|
||||||
|
|
||||||
const onlyMedia = useAppSelector((state) => state.getIn(['settings', 'firehose', 'onlyMedia'], false));
|
|
||||||
const hasUnread = useAppSelector((state) => state.getIn(['timelines', `${feedType}${onlyMedia ? ':media' : ''}`, 'unread'], 0) > 0);
|
|
||||||
|
|
||||||
const allowLocalOnly = useAppSelector((state) => state.getIn(['settings', 'firehose', 'allowLocalOnly']));
|
const allowLocalOnly = useAppSelector((state) => state.getIn(['settings', 'firehose', 'allowLocalOnly']));
|
||||||
const regex = useAppSelector((state) => state.getIn(['settings', 'firehose', 'regex', 'body']));
|
const regex = useAppSelector((state) => state.getIn(['settings', 'firehose', 'regex', 'body']));
|
||||||
|
|
||||||
|
const onlyMedia = useAppSelector((state) => state.getIn(['settings', 'firehose', 'onlyMedia'], false));
|
||||||
|
const hasUnread = useAppSelector((state) => state.getIn(['timelines', `${feedType}${feedType === 'public' && allowLocalOnly ? ':allow_local_only' : ''}${onlyMedia ? ':media' : ''}`, 'unread'], 0) > 0);
|
||||||
|
|
||||||
const handlePin = useCallback(
|
const handlePin = useCallback(
|
||||||
() => {
|
() => {
|
||||||
switch(feedType) {
|
switch(feedType) {
|
||||||
|
|
Loading…
Reference in a new issue