Skip to content

Revert "webview html: Get stream name from stream, rather than message" #5207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisbobbe merged 1 commit into from
Jan 28, 2022
Merged

Revert "webview html: Get stream name from stream, rather than message" #5207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions src/webview/html/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import {
} from '../../utils/narrow';
import { foregroundColorFromBackground } from '../../utils/color';
import { humanDate } from '../../utils/date';
import { pmUiRecipientsFromMessage, pmKeyRecipientsFromMessage } from '../../utils/recipient';
import {
pmUiRecipientsFromMessage,
pmKeyRecipientsFromMessage,
streamNameOfStreamMessage,
} from '../../utils/recipient';
import { base64Utf8Encode } from '../../utils/encoding';

const renderSubject = message =>
Expand All @@ -28,16 +32,14 @@ const renderSubject = message =>
* This is a private helper of messageListElementHtml.
*/
export default (
{ ownUser, streams, subscriptions }: BackgroundData,
{ ownUser, subscriptions }: BackgroundData,
element: HeaderMessageListElement,
): string => {
const { subsequentMessage: message, style: headerStyle } = element;

if (message.type === 'stream') {
const stream = streams.get(message.stream_id);
invariant(stream, 'stream should exist for message');

const topicNarrowStr = keyFromNarrow(topicNarrow(stream.name, message.subject));
const streamName = streamNameOfStreamMessage(message);
const topicNarrowStr = keyFromNarrow(topicNarrow(streamName, message.subject));
const topicHtml = renderSubject(message);

if (headerStyle === 'topic+date') {
Expand All @@ -55,7 +57,7 @@ export default (
const subscription = subscriptions.get(message.stream_id);
const backgroundColor = subscription ? subscription.color : 'hsl(0, 0%, 80%)';
const textColor = foregroundColorFromBackground(backgroundColor);
const streamNarrowStr = keyFromNarrow(streamNarrow(stream.name));
const streamNarrowStr = keyFromNarrow(streamNarrow(streamName));

return template`
<div class="msglist-element header-wrapper header stream-header topic-header"
Expand All @@ -65,7 +67,7 @@ export default (
style="color: ${textColor};
background: ${backgroundColor}"
data-narrow="${base64Utf8Encode(streamNarrowStr)}">
# ${stream.name}
# ${streamName}
</div>
<div class="topic-text">$!${topicHtml}</div>
<div class="topic-date">${humanDate(new Date(message.timestamp * 1000))}</div>
Expand Down