Merge pull request #6281 from maunium/unread-notices
Let m.notice messages mark a room as unreadpull/21833/head
commit
690656e3b2
|
@ -16,7 +16,7 @@ limitations under the License.
|
||||||
|
|
||||||
import { Room } from "matrix-js-sdk/src/models/room";
|
import { Room } from "matrix-js-sdk/src/models/room";
|
||||||
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
|
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
|
||||||
import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
|
import { EventType } from "matrix-js-sdk/src/@types/event";
|
||||||
|
|
||||||
import { MatrixClientPeg } from "./MatrixClientPeg";
|
import { MatrixClientPeg } from "./MatrixClientPeg";
|
||||||
import shouldHideEvent from './shouldHideEvent';
|
import shouldHideEvent from './shouldHideEvent';
|
||||||
|
@ -43,12 +43,6 @@ export function eventTriggersUnreadCount(ev: MatrixEvent): boolean {
|
||||||
case EventType.RoomCanonicalAlias:
|
case EventType.RoomCanonicalAlias:
|
||||||
case EventType.RoomServerAcl:
|
case EventType.RoomServerAcl:
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
case EventType.RoomMessage:
|
|
||||||
if (ev.getContent().msgtype === MsgType.Notice) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ev.isRedacted()) return false;
|
if (ev.isRedacted()) return false;
|
||||||
|
|
Loading…
Reference in New Issue