Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions client/public/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,6 +400,7 @@ body {
margin: var(--gap);
gap: var(--gap-half);
anchor-name: --emoji-picker-anchor;
margin-top: 0;
}

.file-upload-button,
Expand DownExpand Up@@ -720,13 +721,12 @@ dialog {
margin-top: 10px;
}

.member-avatar,
.member-avatar img {
.avatar.member-avatar,
.avatar.member-avatar img {
width: 30px;
aspect-ratio: 1 / 1;
border-radius: 100%;
/* eslint-disable-next-line css/no-important -- It's not unexpected, I expected it! */
font-size: 14px !important;
font-size: 14px;
}

.context-menu {
Expand DownExpand Up@@ -779,6 +779,7 @@ dialog {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--gap-half);
}

.message audio,
Expand DownExpand Up@@ -844,3 +845,42 @@ dialog {
flex-direction: row;
justify-content: center;
}

#typing-indicator {
display: flex;
gap: var(--space-width);
align-items: center;
margin-left: var(--gap);
min-height: 20px;
}

.typing-avatar-list .avatar-list-avatar {
height: 1.5em;
font-size: 16px;
aspect-ratio: 1 / 1;
border-radius: 100%;
}

#avatar-list .avatar-list-avatar:not(:first-child) {
margin-right: -16px;
}

.avatar-list-avatar {
border: 4px solid var(--background-primary);
}

#avatar-list {
display: flex;
flex-direction: row-reverse;
align-items: center;
}

.typing-label {
font-size: 0.75em;
color: var(--text-muted);
}

.typing-user {
font-weight: bold;
color: white;
}
23 changes: 23 additions & 0 deletions client/src/comps/AvatarList.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import Avatar from "./Avatar"
import Component from "./Component"

export default class AvatarList extends Component {
maxAvatars: number

constructor(
users: string[],
{ classes = [], maxAvatars = 3 }: { classes?: string[]; maxAvatars: number }
) {
super("div", { id: "avatar-list", classes })
this.maxAvatars = maxAvatars
this.reset(users)
}

reset(users: string[]) {
this.element.innerHTML = ""
for (const user of users.slice(0, this.maxAvatars).toReversed()) {
const avatar = new Avatar(user, "avatar-list-avatar")
this.element.appendChild(avatar.element)
}
}
}
23 changes: 23 additions & 0 deletions client/src/comps/ChatInput.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@ import RoomView from "./views/RoomView"

// Credits to DeepSeek-R1, wow (edited though)
export default class ChatInput extends Component {
public static readonly TYPING_TIMEOUT = 10000

readonly emojiPicker: EmojiPicker

constructor(view: PostView | RoomView) {
Expand DownExpand Up@@ -65,6 +67,27 @@ export default class ChatInput extends Component {
// this fixes weird browser behavior
if (chatInput.innerHTML == "<br>") chatInput.innerHTML = ""
})
let lastTypingSent = 0
let lastTypingValue = false
chatInput.addEventListener("keyup", async () => {
if (!(view instanceof RoomView)) return
if (view.getCurrentRoom() == undefined) return
const isEmpty = chatInput.innerText.trim() == ""
if (
lastTypingValue != isEmpty ||
Date.now() - lastTypingSent > ChatInput.TYPING_TIMEOUT
) {
lastTypingSent = Date.now()
lastTypingValue = isEmpty
// TODO: configurable timeout?
// TODO: allow disabling typing notifications?
await matrix.sendTyping(
view.getCurrentRoom()!.roomId,
!isEmpty,
ChatInput.TYPING_TIMEOUT
)
}
})

// Create emoji button
const emojiButton = document.createElement("button")
Expand Down
38 changes: 38 additions & 0 deletions client/src/comps/TypingIndicator.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
import { RoomMember } from "matrix-js-sdk"
import Component from "./Component"
import { twemojiParse } from "../md"
import AvatarList from "./AvatarList"

export default class TypingIndicator extends Component {
avatarList: AvatarList
label: HTMLSpanElement

constructor() {
super("div", { id: "typing-indicator" })
this.avatarList = new AvatarList([], {
classes: ["typing-avatar-list"],
maxAvatars: 3,
})
this.label = document.createElement("span")
this.label.className = "typing-label"
this.element.appendChild(this.avatarList.element)
this.element.appendChild(this.label)
}

reset(users: RoomMember[]) {
this.avatarList.reset(users.map(u => u.userId))
this.label.innerHTML = this.renderLabel(users)
}

renderLabel(users: RoomMember[]) {
const names = users.map(
u => `<span class="typing-user">${twemojiParse(u.name)}</span>`
)
if (users.length === 0) return ""
if (users.length === 1) return `${names[0]} is typing...`
if (users.length === 2) return `${names[0]} and ${names[1]} are typing...`
if (users.length === 3)
return `${names[0]}, ${names[1]}, and ${names[2]} are typing...`
return `${names[0]} and <span class="typing-user">${users.length - 1} others</span> are typing...`
}
}
27 changes: 26 additions & 1 deletion client/src/comps/views/RoomView.ts
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
import View from "../views//View"
import ChatInput from "../ChatInput"
import EventList from "../EventList"
import { MatrixEvent, Room, RoomEvent } from "matrix-js-sdk"
import { MatrixEvent, Room, RoomEvent, RoomMember, RoomMemberEvent } from "matrix-js-sdk"
import { matrix } from "../../matrix"
import MemberList from "../MemberList"
import { parseEventContent } from "../../events"
import TypingIndicator from "../TypingIndicator"

export default class RoomView extends View {
private currentRoom?: Room

public readonly msgList: EventList
public readonly chatInput: ChatInput
public readonly memberList: MemberList
public readonly typingIndicator: TypingIndicator

private timelineEventHandler?: (event: MatrixEvent) => void
private redactionEventHandler?: (event: MatrixEvent) => Promise<void>
private typingEventHandler?: (event: MatrixEvent) => void

public typingUsers: RoomMember[] = []

constructor() {
super("div", { id: "room-view" })

this.msgList = new EventList()
this.chatInput = new ChatInput(this)
this.memberList = new MemberList()
this.typingIndicator = new TypingIndicator()

const container = document.createElement("div")
container.className = "post-container"

const wrapper = document.createElement("div")
wrapper.className = "room-wrapper"
wrapper.appendChild(this.msgList.element)
wrapper.appendChild(this.typingIndicator.element)
wrapper.appendChild(this.chatInput.element)
container.appendChild(wrapper)

Expand DownExpand Up@@ -61,23 +68,41 @@ export default class RoomView extends View {
}
}

onTypingEvent(room: Room) {
return () => {
this.updateTypingIndicator(room)
}
}

updateTypingIndicator(room: Room) {
this.typingUsers = room
.getMembers()
.filter(m => m.typing && m.userId !== matrix.getUserId())
this.typingIndicator.reset(this.typingUsers)
}

async reset(room: Room) {
this.head.reset(room.name)
await matrix.roomInitialSync(room.roomId, 20)
const events = room.getLiveTimeline().getEvents()
this.msgList.reset(events)
this.updateTypingIndicator(room)

if (this.timelineEventHandler)
matrix.off(RoomEvent.Timeline, this.timelineEventHandler)
if (this.redactionEventHandler)
matrix.off(RoomEvent.Redaction, this.redactionEventHandler)
if (this.typingEventHandler)
matrix.off(RoomMemberEvent.Typing, this.typingEventHandler)

this.currentRoom = room

this.timelineEventHandler = this.onTimelineEvent(this.currentRoom)
this.redactionEventHandler = this.onRedaction(this.currentRoom)
this.typingEventHandler = this.onTypingEvent(this.currentRoom)
matrix.on(RoomEvent.Timeline, this.timelineEventHandler)
matrix.on(RoomEvent.Redaction, this.redactionEventHandler)
matrix.on(RoomMemberEvent.Typing, this.typingEventHandler)

this.updateMemberList(room)
}
Expand Down