Compare commits

..
Author SHA1 Message Date
mayeaux 94d625f41e Send video bitrate and user bandwidth to Watchman (#7145) 2021-10-06 14:59:33 -04:00
8 changed files with 25 additions and 76 deletions

No files matched your search

+1 -3
View File
@@ -20,7 +20,6 @@ type Props = {
disableEdit?: boolean,
disableRemove?: boolean,
supportAmount?: any,
isLiveComment: boolean,
// --- select ---
claim: ?Claim,
claimIsMine: boolean,
@@ -55,7 +54,6 @@ function CommentMenuList(props: Props) {
disableEdit,
disableRemove,
supportAmount,
isLiveComment,
doToast,
handleEditComment,
openModal,
@@ -231,7 +229,7 @@ function CommentMenuList(props: Props) {
</>
)}
{IS_WEB && !isLiveComment && (
{IS_WEB && (
<MenuItem className="comment__menu-option" onSelect={handleCopyCommentLink}>
<div className="menu__link">
<Icon aria-hidden icon={ICONS.COPY_LINK} />
+5 -22
View File
@@ -10,7 +10,7 @@ import remarkFrontMatter from 'remark-frontmatter';
import reactRenderer from 'remark-react';
import MarkdownLink from 'component/markdownLink';
import defaultSchema from 'hast-util-sanitize/lib/github.json';
import { formattedLinks, inlineLinks } from 'util/remark-lbry';
import { formatedLinks, inlineLinks } from 'util/remark-lbry';
import { formattedTimestamp, inlineTimestamp } from 'util/remark-timestamp';
import ZoomableImage from 'component/zoomableImage';
import { CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS, SIMPLE_SITE } from 'config';
@@ -133,9 +133,8 @@ function isStakeEnoughForPreview(stakedLevel) {
const MarkdownPreview = (props: MarkdownProps) => {
const { content, strip, simpleLinks, noDataStore, className, parentCommentId, isMarkdownPost, stakedLevel } = props;
const strippedContent = content
? content.replace(REPLACE_REGEX, (iframeHtml) => {
? content.replace(REPLACE_REGEX, (iframeHtml, y, iframeSrc) => {
// Let the browser try to create an iframe to see if the markup is valid
const outer = document.createElement('div');
outer.innerHTML = iframeHtml;
@@ -153,10 +152,6 @@ const MarkdownPreview = (props: MarkdownProps) => {
})
: '';
const initialQuote = strippedContent.split(' ').find((word) => word.length > 0 || word.charAt(0) === '>');
let stripQuote;
if (initialQuote && initialQuote.charAt(0) === '>') stripQuote = true;
const remarkOptions: Object = {
sanitize: schema,
fragment: React.Fragment,
@@ -197,22 +192,10 @@ const MarkdownPreview = (props: MarkdownProps) => {
};
// Strip all content and just render text
if (strip || stripQuote) {
if (strip) {
// Remove new lines and extra space
remarkOptions.remarkReactComponents.p = SimpleText;
return stripQuote ? (
<span dir="auto" className="markdown-preview">
<blockquote>
{
remark()
.use(remarkStrip)
.use(remarkFrontMatter, ['yaml'])
.use(reactRenderer, remarkOptions)
.processSync(content).contents
}
</blockquote>
</span>
) : (
return (
<span dir="auto" className="markdown-preview">
{
remark()
@@ -232,7 +215,7 @@ const MarkdownPreview = (props: MarkdownProps) => {
.use(remarkAttr, remarkAttrOpts)
// Remark plugins for lbry urls
// Note: The order is important
.use(formattedLinks)
.use(formatedLinks)
.use(inlineLinks)
.use(isMarkdownPost ? null : inlineTimestamp)
.use(isMarkdownPost ? null : formattedTimestamp)
+5 -11
View File
@@ -11,7 +11,6 @@ import classnames from 'classnames';
import CommentMenuList from 'component/commentMenuList';
import Button from 'component/button';
import CreditAmount from 'component/common/credit-amount';
import useHover from 'effects/use-hover';
type Props = {
uri: string,
@@ -44,18 +43,14 @@ function LivestreamComment(props: Props) {
isPinned,
} = props;
const commentRef = React.useRef();
const isHovering = useHover(commentRef);
const commentByContentOwner = claim && claim.signing_channel && claim.signing_channel.permanent_url === authorUri;
const commentByOwnerOfContent = claim && claim.signing_channel && claim.signing_channel.permanent_url === authorUri;
const { claimName } = parseURI(authorUri);
return (
<li
className={classnames('livestream-comment', {
'livestream-comment--superchat': supportAmount > 0,
'livestream-comment--hover': isHovering,
})}
ref={commentRef}
>
{supportAmount > 0 && (
<div className="super-chat livestream-superchat__banner">
@@ -83,7 +78,7 @@ function LivestreamComment(props: Props) {
</Tooltip>
)}
{commentByContentOwner && (
{commentByOwnerOfContent && (
<Tooltip label={__('Streamer')}>
<span className="comment__badge">
<Icon icon={ICONS.BADGE_STREAMER} size={16} />
@@ -93,7 +88,7 @@ function LivestreamComment(props: Props) {
<Button
className={classnames('button--uri-indicator comment__author', {
'comment__author--creator': commentByContentOwner,
'comment__author--creator': commentByOwnerOfContent,
})}
target="_blank"
navigate={authorUri}
@@ -124,11 +119,10 @@ function LivestreamComment(props: Props) {
commentId={commentId}
authorUri={authorUri}
commentIsMine={commentIsMine}
disableEdit
isTopLevel
isPinned={isPinned}
disableRemove={supportAmount > 0}
isTopLevel
disableEdit
isLiveComment
/>
</Menu>
</div>
+3 -6
View File
@@ -268,12 +268,9 @@ $thumbnailWidthSmall: 1rem;
max-width: 35rem;
color: var(--color-text);
ul li {
list-style-type: disc;
ul li {
list-style-type: circle;
}
ul li,
ol li {
list-style-position: inside;
}
p {
+4 -25
View File
@@ -91,22 +91,11 @@ $recent-msg-button__height: 2rem;
}
}
.livestream-comment__info {
overflow: hidden;
}
.livestream-comment--superchat {
+ .livestream-comment--superchat {
margin-bottom: var(--spacing-xxs);
}
.livestream-comment__body {
display: flex;
align-items: flex-start;
flex-direction: unset;
flex: unset;
}
.livestream-comment__info {
margin-top: calc(var(--spacing-xxs) / 2);
}
@@ -124,24 +113,15 @@ $recent-msg-button__height: 2rem;
}
}
.livestream-comment--hover {
background-color: var(--color-card-background-highlighted);
}
@media (min-width: $breakpoint-small) {
.livestream-comment:not(:hover) {
.menu__button:not(:focus):not([aria-expanded='true']) {
opacity: 0;
}
}
.livestream-comment__body {
display: flex;
align-items: flex-start;
}
.livestream-comment__body {
display: flex;
flex-direction: column;
flex: 2;
align-items: flex-start;
margin-left: var(--spacing-s);
overflow: hidden;
.channel-thumbnail {
@include handleChannelGif(2rem);
@@ -373,7 +353,6 @@ $recent-msg-button__height: 2rem;
.livestream-comment__text {
padding-right: var(--spacing-xl);
padding-bottom: var(--spacing-xxs);
.markdown-preview {
p {
word-break: break-word;
-2
View File
@@ -1,6 +1,4 @@
.markdown-preview {
word-break: break-all;
> :first-child {
margin-top: 0;
}
+5 -5
View File
@@ -108,15 +108,15 @@ function tokenizeURI(eat, value, silent) {
// Configure tokenizer for lbry urls
tokenizeURI.locator = locateURI;
tokenizeURI.notInList = false;
tokenizeURI.notInList = true;
tokenizeURI.notInLink = true;
tokenizeURI.notInBlock = false;
tokenizeURI.notInBlock = true;
// Configure tokenizer for lbry channels
tokenizeMention.locator = locateMention;
tokenizeMention.notInList = false;
tokenizeMention.notInList = true;
tokenizeMention.notInLink = true;
tokenizeMention.notInBlock = false;
tokenizeMention.notInBlock = true;
const visitor = (node, index, parent) => {
if (node.type === 'link' && parent && parent.type === 'paragraph') {
@@ -149,7 +149,7 @@ const transform = (tree) => {
visit(tree, ['link'], visitor);
};
export const formattedLinks = () => transform;
export const formatedLinks = () => transform;
// Main module
export function inlineLinks() {
+2 -2
View File
@@ -108,9 +108,9 @@ function tokenizeTimestamp(eat, value, silent) {
}
tokenizeTimestamp.locator = locateTimestamp;
tokenizeTimestamp.notInList = false; // Flag doesn't work? It'll always tokenizes in List and never in Bullet.
tokenizeTimestamp.notInList = true; // Flag doesn't work? It'll always tokenizes in List and never in Bullet.
tokenizeTimestamp.notInLink = true;
tokenizeTimestamp.notInBlock = false;
tokenizeTimestamp.notInBlock = true;
export function inlineTimestamp() {
const Parser = this.Parser;