Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Framasoft
PeerTube
PeerTube
Commits
647c2b7d
Verified
Commit
647c2b7d
authored
Jan 25, 2023
by
Chocobozzz
Browse files
Fix custom markup
parent
d5ae943d
Changes
5
Hide whitespace changes
Inline
Side-by-side
client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts
View file @
647c2b7d
import
{
from
}
from
'
rxjs
'
import
{
finalize
,
map
,
switchMap
,
tap
}
from
'
rxjs/operators
'
import
{
ChangeDetectionStrategy
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
MarkdownService
,
Notifier
,
UserService
}
from
'
@app/core
'
import
{
FindInBulkService
}
from
'
@app/shared/shared-search
'
import
{
VideoSortField
}
from
'
@shared/models
'
...
...
@@ -34,7 +34,8 @@ export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, O
private
findInBulk
:
FindInBulkService
,
private
videoService
:
VideoService
,
private
userService
:
UserService
,
private
notifier
:
Notifier
private
notifier
:
Notifier
,
private
cd
:
ChangeDetectorRef
)
{
}
ngOnInit
()
{
...
...
@@ -57,6 +58,8 @@ export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, O
next
:
({
total
,
data
})
=>
{
this
.
totalVideos
=
total
this
.
video
=
data
[
0
]
this
.
cd
.
markForCheck
()
},
error
:
err
=>
this
.
notifier
.
error
(
$localize
`Error in channel miniature component:
${
err
.
message
}
`
)
...
...
client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.ts
View file @
647c2b7d
import
{
finalize
}
from
'
rxjs/operators
'
import
{
ChangeDetectionStrategy
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
Notifier
}
from
'
@app/core
'
import
{
FindInBulkService
}
from
'
@app/shared/shared-search
'
import
{
MiniatureDisplayOptions
}
from
'
../../shared-video-miniature
'
...
...
@@ -36,14 +36,18 @@ export class PlaylistMiniatureMarkupComponent implements CustomMarkupComponent,
constructor
(
private
findInBulkService
:
FindInBulkService
,
private
notifier
:
Notifier
private
notifier
:
Notifier
,
private
cd
:
ChangeDetectorRef
)
{
}
ngOnInit
()
{
this
.
findInBulkService
.
getPlaylist
(
this
.
uuid
)
.
pipe
(
finalize
(()
=>
this
.
loaded
.
emit
(
true
)))
.
subscribe
({
next
:
playlist
=>
this
.
playlist
=
playlist
,
next
:
playlist
=>
{
this
.
playlist
=
playlist
this
.
cd
.
markForCheck
()
},
error
:
err
=>
this
.
notifier
.
error
(
$localize
`Error in playlist miniature component:
${
err
.
message
}
`
)
})
...
...
client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts
View file @
647c2b7d
import
{
finalize
}
from
'
rxjs/operators
'
import
{
ChangeDetectionStrategy
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
AuthService
,
Notifier
}
from
'
@app/core
'
import
{
FindInBulkService
}
from
'
@app/shared/shared-search
'
import
{
Video
}
from
'
../../shared-main
'
...
...
@@ -37,7 +37,8 @@ export class VideoMiniatureMarkupComponent implements CustomMarkupComponent, OnI
constructor
(
private
auth
:
AuthService
,
private
findInBulk
:
FindInBulkService
,
private
notifier
:
Notifier
private
notifier
:
Notifier
,
private
cd
:
ChangeDetectorRef
)
{
}
getUser
()
{
...
...
@@ -56,7 +57,10 @@ export class VideoMiniatureMarkupComponent implements CustomMarkupComponent, OnI
this
.
findInBulk
.
getVideo
(
this
.
uuid
)
.
pipe
(
finalize
(()
=>
this
.
loaded
.
emit
(
true
)))
.
subscribe
({
next
:
video
=>
this
.
video
=
video
,
next
:
video
=>
{
this
.
video
=
video
this
.
cd
.
markForCheck
()
},
error
:
err
=>
this
.
notifier
.
error
(
$localize
`Error in video miniature component:
${
err
.
message
}
`
)
})
...
...
client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
View file @
647c2b7d
import
{
finalize
}
from
'
rxjs/operators
'
import
{
ChangeDetectionStrategy
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
EventEmitter
,
Input
,
OnInit
,
Output
}
from
'
@angular/core
'
import
{
AuthService
,
Notifier
}
from
'
@app/core
'
import
{
VideoSortField
}
from
'
@shared/models
'
import
{
Video
,
VideoService
}
from
'
../../shared-main
'
...
...
@@ -46,7 +46,8 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
constructor
(
private
auth
:
AuthService
,
private
videoService
:
VideoService
,
private
notifier
:
Notifier
private
notifier
:
Notifier
,
private
cd
:
ChangeDetectorRef
)
{
}
getUser
()
{
...
...
@@ -73,7 +74,10 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
return
this
.
getVideosObservable
()
.
pipe
(
finalize
(()
=>
this
.
loaded
.
emit
(
true
)))
.
subscribe
({
next
:
({
data
})
=>
this
.
videos
=
data
,
next
:
({
data
})
=>
{
this
.
videos
=
data
this
.
cd
.
markForCheck
()
},
error
:
err
=>
this
.
notifier
.
error
(
$localize
`Error in videos list component:
${
err
.
message
}
`
)
})
...
...
config/dev.yaml
View file @
647c2b7d
...
...
@@ -9,6 +9,9 @@ secrets:
peertube
:
'
my
super
dev
secret'
rates_limit
:
api
:
window
:
10 seconds
max
:
500
signup
:
window
:
5 minutes
max
:
200
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment