LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Chat/comment markdown and style fixes #7193

Closed
saltrafael wants to merge 6 commits from chat-markdown into master
pull from: chat-markdown
merge into: LBRYCommunity:master
Conversation 2 Commits 6 Files changed 8 +76 -25
saltrafael commented 2021-09-30 14:19:31 +02:00 (Migrated from github.com)
Copy link

Fixes

Issue Number: Closes #5560, closes #5845, closes #5561

PR Checklist

Toggle...

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting)
  • Refactoring (no functional changes)
  • Documentation changes
  • Other - Please describe:

Please check all that apply to this PR using "x":

  • I have checked that this PR is not a duplicate of an existing PR (open, closed or merged)
  • I added a line describing my change to CHANGELOG.md
  • I have checked that this PR does not introduce a breaking change
  • This PR introduces breaking changes and I have provided a detailed explanation below
## Fixes Issue Number: Closes #5560, closes #5845, closes #5561 ## PR Checklist <!-- For the checkbox formatting to work properly, make sure there are no spaces on either side of the "x" --> <details><summary>Toggle...</summary> What kind of change does this PR introduce? - [X] Bugfix - [ ] Feature - [ ] Code style update (formatting) - [ ] Refactoring (no functional changes) - [ ] Documentation changes - [ ] Other - Please describe: Please check all that apply to this PR using "x": - [X] I have checked that this PR is not a duplicate of an existing PR (open, closed or merged) - [ ] I added a line describing my change to CHANGELOG.md - [X] I have checked that this PR does not introduce a breaking change - [ ] This PR introduces breaking changes and I have provided a detailed explanation below </details>
tzarebczan commented 2021-09-30 20:06:03 +02:00 (Migrated from github.com)
Copy link

Does this require a certain level to do markdown?

Does this require a certain level to do markdown?
saltrafael commented 2021-10-08 15:33:22 +02:00 (Migrated from github.com)
Copy link

I think this might be ready for merge now. Just did fixes around markdown and styles and can handle what to do with image embeds later with stickers

embeds that require channel stake weren't resized properly:
image.png image.png

fixed overflow on embed on super-chat causing scroll issues:
image

removed "copy comment link" from chat comments:
image.png

multiple quotes will show once and won't break live chat:
image.png image.png

I think this might be ready for merge now. Just did fixes around markdown and styles and can handle what to do with image embeds later with stickers embeds that require channel stake weren't resized properly: [![image.png](https://i.postimg.cc/zfP6yPQt/image.png)](https://postimg.cc/KKBJVQxB) [![image.png](https://i.postimg.cc/6pJPRvYK/image.png)](https://postimg.cc/hfsMRhkZ) fixed overflow on embed on super-chat causing scroll issues: ![image](https://user-images.githubusercontent.com/76502841/136565493-26194302-dcad-425b-a270-10a21872667f.png) removed "copy comment link" from chat comments: [![image.png](https://i.postimg.cc/HWPwf1yP/image.png)](https://postimg.cc/8sMf63wh) multiple quotes will show once and won't break live chat: [![image.png](https://i.postimg.cc/hPxtBNj0/image.png)](https://postimg.cc/svjrP65B) [![image.png](https://i.postimg.cc/mD60zZdF/image.png)](https://postimg.cc/CBkv90pF)
infinite-persistence (Migrated from github.com) requested changes 2021-10-11 18:29:52 +02:00
ui/component/commentMenuList/view.jsx
infinite-persistence (Migrated from github.com) commented 2021-10-11 18:20:59 +02:00
Copy link

Not sure why, but with a level 5 account, the comment menu button doesn't popup after I send the following message. After I refresh, then it allows me to Remove my comment. Was using Brave (not sure if it matters)

- Just http link (should not embed):
https://www.google.com

- Just http link of claim (should embed):
https://lbry.tv/@lbry:3f/levelsonodysee:c


Using iframe with lbry link (should embed):
<iframe src="lbry://@lbry#3f/befreeonlbry#5"></iframe>

Using iframe with http link of claim (should embed):
<iframe src="https://lbry.tv/@lbry:3f/levelsonodysee:c"></iframe>

lbry link (should embed):
lbry://@lbry#3f/befreeonlbry#5
Not sure why, but with a level 5 account, the comment menu button doesn't popup after I send the following message. After I refresh, then it allows me to Remove my comment. Was using Brave (not sure if it matters) ``` - Just http link (should not embed): https://www.google.com - Just http link of claim (should embed): https://lbry.tv/@lbry:3f/levelsonodysee:c Using iframe with lbry link (should embed): <iframe src="lbry://@lbry#3f/befreeonlbry#5"></iframe> Using iframe with http link of claim (should embed): <iframe src="https://lbry.tv/@lbry:3f/levelsonodysee:c"></iframe> lbry link (should embed): lbry://@lbry#3f/befreeonlbry#5 ```
ui/component/common/markdown-preview.jsx
@ -12,3 +12,3 @@
import defaultSchema from 'hast-util-sanitize/lib/github.json';
import { formatedLinks, inlineLinks } from 'util/remark-lbry';
import { formattedLinks, inlineLinks } from 'util/remark-lbry';
import { formattedTimestamp, inlineTimestamp } from 'util/remark-timestamp';
infinite-persistence (Migrated from github.com) commented 2021-10-11 17:50:36 +02:00
Copy link

Dash parsing in channel name broken

I think this issue came from changes in Channel Mention. Can fix together if possible:

In a post,

----
Playlist:
<iframe id="lbry-iframe" width="560" height="315" src="https://lbry.tv/$/embed/Wrestling/e9a586dcf13c5fe8f30692c6b39d1c8e9323ea69?r=4bWsJBCcfyXoHwYBHEXV61pTrf3RW5Fe" allowfullscreen></iframe>

<iframe src="lbry://@ip-test-2#c/Wrestling#e"></iframe>

<iframe id="lbry-iframe" width="560" height="315" src="lbry://@ip-test-2#c/Wrestling#e" allowfullscreen></iframe>
----

yields:
image

The commit before Channel Mention yields (the correct version):
image

## Dash parsing in channel name broken I think this issue came from changes in Channel Mention. Can fix together if possible: In a post, ``` ---- Playlist: <iframe id="lbry-iframe" width="560" height="315" src="https://lbry.tv/$/embed/Wrestling/e9a586dcf13c5fe8f30692c6b39d1c8e9323ea69?r=4bWsJBCcfyXoHwYBHEXV61pTrf3RW5Fe" allowfullscreen></iframe> <iframe src="lbry://@ip-test-2#c/Wrestling#e"></iframe> <iframe id="lbry-iframe" width="560" height="315" src="lbry://@ip-test-2#c/Wrestling#e" allowfullscreen></iframe> ---- ``` yields: ![image](https://user-images.githubusercontent.com/64950861/136819141-830232df-31d2-464c-82c7-30c7b795add5.png) The commit before Channel Mention yields (the correct version): ![image](https://user-images.githubusercontent.com/64950861/136819409-1d3c06c9-a927-4e7f-8bc6-7a1ac5a9d81d.png)
ui/component/common/markdown-preview.jsx
@ -13,3 +13,3 @@
import { formatedLinks, inlineLinks } from 'util/remark-lbry';
import { formattedLinks, inlineLinks } from 'util/remark-lbry';
import { formattedTimestamp, inlineTimestamp } from 'util/remark-timestamp';
import ZoomableImage from 'component/zoomableImage';
infinite-persistence (Migrated from github.com) commented 2021-10-11 17:54:20 +02:00
Copy link

Some embeds not showing

The picture on the left is before the Channel Mention commit. The picture on the right is this PR.

image

The markdown is:

----
Video 1:
<iframe src="lbry://@Tasteshow#9/the-crispiest-chicken-wings-recipe-with#9"></iframe>
----
## Some embeds not showing The picture on the left is before the Channel Mention commit. The picture on the right is this PR. ![image](https://user-images.githubusercontent.com/64950861/136819818-d82f98c8-50a4-4e5c-86eb-3e0fe3376767.png) The markdown is: ``` ---- Video 1: <iframe src="lbry://@Tasteshow#9/the-crispiest-chicken-wings-recipe-with#9"></iframe> ---- ```
ui/component/common/markdown-preview.jsx
@ -14,3 +13,4 @@
import { formattedLinks, 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';
infinite-persistence (Migrated from github.com) commented 2021-10-11 18:08:37 +02:00
Copy link

#5845 says "don't allow embeds on livestreams", but with a level 5 account, I was able to.

image

#5845 says "don't allow embeds on livestreams", but with a level 5 account, I was able to. ![image](https://user-images.githubusercontent.com/64950861/136821799-5d0ef4f4-7804-4a94-a991-0e996560d1bd.png)
ui/scss/component/_comments.scss
@ -274,3 +276,4 @@
}
}
p {
infinite-persistence (Migrated from github.com) commented 2021-10-11 18:11:16 +02:00
Copy link

On large layout, the bullet appears correctly, but on small, it doesn't appear.

image

On large layout, the bullet appears correctly, but on small, it doesn't appear. ![image](https://user-images.githubusercontent.com/64950861/136822121-33cf9a8a-6df7-4fbe-9926-4526df5b45d6.png)
infinite-persistence (Migrated from github.com) reviewed 2021-10-11 18:34:52 +02:00
ui/component/common/markdown-preview.jsx
@ -14,3 +13,4 @@
import { formattedLinks, 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';
infinite-persistence (Migrated from github.com) commented 2021-10-11 18:34:51 +02:00
Copy link

Same goes for images. I thought we were supposed to disable them in favor of stickers (I could be wrong)

image

Same goes for images. I thought we were supposed to disable them in favor of stickers (I could be wrong) ![image](https://user-images.githubusercontent.com/64950861/136824947-24f39aac-e43c-402b-9883-e0e657729320.png)
saltrafael (Migrated from github.com) reviewed 2021-10-12 14:59:51 +02:00
ui/component/common/markdown-preview.jsx
@ -14,3 +13,4 @@
import { formattedLinks, 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';
saltrafael (Migrated from github.com) commented 2021-10-12 14:59:51 +02:00
Copy link

yeah those will be disabled along with the stickers, so it's okay for now

yeah those will be disabled along with the stickers, so it's okay for now
saltrafael (Migrated from github.com) reviewed 2021-10-12 15:01:37 +02:00
ui/component/commentMenuList/view.jsx
saltrafael (Migrated from github.com) commented 2021-10-12 15:01:37 +02:00
Copy link

Didn't get this one, weird... let me know if it happens again or in another way

Didn't get this one, weird... let me know if it happens again or in another way

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
infinite-persistence
Labels
Clear labels   
accessibility

   
app-parity

   
area: creator

   
area: daemon

   
area: design

   
area: devops

   
area: discovery

   
area: docs

   
area: installer

   
area: internal

   
area: livestream

   
area: performance

   
area: proposal

Work is part of a proposal

  
area: reposts

   
area: rewards

   
area: search

   
area: security

   
area: subscriptions

   
area: sync

   
area: ux

   
area: viewer

   
area: wallet

   
BEAMER

Beamer is waiting on you!

  
channel

   
comments

   
community PR

   
consider soon

Discuss this issue at the next planning meeting, then remove this label

  
core team

   
css

   
dependencies

   
electron

   
Epic

   
feature request

   
first-timers-only

   
good first issue

   
hacktoberfest

Welcome to Hacktoberfest

  
help wanted

   
hub-dependent

   
icebox

Long-term storage

  
Invalid

   
level: 0

   
level: 1

No knowledge of the existing code required

  
level: 2

Some knowledge of the existing code is recommended

  
level: 3

Significant knowledge of the existing code is recommended

  
level: 4

Intimate knowledge of the existing code is recommended

  
merge when green

   
needs: exploration

Solution unclear, needs research

  
needs: grooming

Issue needs to be groomed before work can start

  
needs: priority

Priority level needs to be defined

  
needs: repro

Issue needs step-by-step instructions on how to reproduce in latest code

  
needs: tech design

Needs technical design signoff before implementation can begin

  
notifications

   
odysee

   
on hold

Temporarily paused

  
playlists

   
priority: blocker

Issue is blocking release, do ASAP

  
priority: high

Work needs to be moved into sprint ASAP

  
priority: low

Work should be done but can stay in the backlog for now

  
priority: medium

Work needs to be done within 2-3 sprints

  
protocol dependent

   
recsys

   
redesign

general redesign not prioritize for anyone release

  
regression

   
resilience

   
sdk dependent

Requires work on lbry-sdk repo

  
Tom's Wishlist

   
trending

   
type: bug

Existing functionality is wrong or broken

  
type: discussion

A conversation. No specific changes requested

  
type: improvement

Existing (or partially existing) functionality needs to be changed

  
type: new feature

New functionality that does not exist yet

  
type: refactor

Minimal user-visible changes, but significant internal work

  
type: task

Either work that's not related to the code, or a small chore that does not fit into other categories

  
type: testing

Solution needs additional user testing

  
unplanned

Work that was not planned into the spirnt, took priority over planned work

  
windows
No labels
accessibility
app-parity
area: creator
area: daemon
area: design
area: devops
area: discovery
area: docs
area: installer
area: internal
area: livestream
area: performance
area: proposal
area: reposts
area: rewards
area: search
area: security
area: subscriptions
area: sync
area: ux
area: viewer
area: wallet
BEAMER
channel
comments
community PR
consider soon
core team
css
dependencies
electron
Epic
feature request
first-timers-only
good first issue
hacktoberfest
help wanted
hub-dependent
icebox
Invalid
level: 0
level: 1
level: 2
level: 3
level: 4
merge when green
needs: exploration
needs: grooming
needs: priority
needs: repro
needs: tech design
notifications
odysee
on hold
playlists
priority: blocker
priority: high
priority: low
priority: medium
protocol dependent
recsys
redesign
regression
resilience
sdk dependent
Tom's Wishlist
trending
type: bug
type: discussion
type: improvement
type: new feature
type: refactor
type: task
type: testing
unplanned
windows
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: LBRYCommunity/lbry-desktop#7193
No description provided.
Delete branch "chat-markdown"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?