forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix client with google bot

This commit is contained in:
Chocobozzz 2019-02-08 16:16:40 +01:00 committed by Chocobozzz
parent 597a9266d4
commit c7ca4c8be7
4 changed files with 623 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
client/package.json
View File

@ -28,7 +28,8 @@
"resolutions": { "resolutions": {
"video.js": "^7", "video.js": "^7",
"webtorrent/create-torrent/junk": "^1", "webtorrent/create-torrent/junk": "^1",
"simple-get": "^2.8.1" "simple-get": "^2.8.1",
"punycode": "^1.4.1"
}, },
"jest": { "jest": {
"globals": { "globals": {
@ -63,20 +64,20 @@
"setupTestFrameworkScriptFile": "<rootDir>/src/setupJest.ts" "setupTestFrameworkScriptFile": "<rootDir>/src/setupJest.ts"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.11.1", "@angular-devkit/build-angular": "~0.13.1",
"@angular/animations": "~7.1.1", "@angular/animations": "~7.2.4",
"@angular/cli": "~7.1.1", "@angular/cli": "~7.3.1",
"@angular/common": "~7.1.1", "@angular/common": "~7.2.4",
"@angular/compiler": "~7.1.1", "@angular/compiler": "~7.2.4",
"@angular/compiler-cli": "~7.1.1", "@angular/compiler-cli": "~7.2.4",
"@angular/core": "~7.1.1", "@angular/core": "~7.2.4",
"@angular/forms": "~7.1.1", "@angular/forms": "~7.2.4",
"@angular/http": "~7.1.1", "@angular/http": "~7.2.4",
"@angular/language-service": "~7.1.1", "@angular/language-service": "~7.2.4",
"@angular/platform-browser": "~7.1.1", "@angular/platform-browser": "~7.2.4",
"@angular/platform-browser-dynamic": "~7.1.1", "@angular/platform-browser-dynamic": "~7.2.4",
"@angular/router": "~7.1.1", "@angular/router": "~7.2.4",
"@angular/service-worker": "~7.1.1", "@angular/service-worker": "~7.2.4",
"@angularclass/hmr": "^2.1.3", "@angularclass/hmr": "^2.1.3",
"@neos21/bootstrap3-glyphicons": "^1.0.1", "@neos21/bootstrap3-glyphicons": "^1.0.1",
"@ng-bootstrap/ng-bootstrap": "^4.0.0", "@ng-bootstrap/ng-bootstrap": "^4.0.0",

3
client/src/app/videos/+video-watch/video-watch.component.ts
View File

@ -8,7 +8,6 @@ import { MetaService } from '@ngx-meta/core'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { forkJoin, Subscription } from 'rxjs' import { forkJoin, Subscription } from 'rxjs'
import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import * as WebTorrent from 'webtorrent'
import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared' import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
import { AuthService, ConfirmService } from '../../core' import { AuthService, ConfirmService } from '../../core'
import { RestExtractor, VideoBlacklistService } from '../../shared' import { RestExtractor, VideoBlacklistService } from '../../shared'
@ -90,7 +89,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
ngOnInit () { ngOnInit () {
if ( if (
WebTorrent.WEBRTC_SUPPORT === false || !!((window as any).RTCPeerConnection || (window as any).mozRTCPeerConnection || (window as any).webkitRTCPeerConnection) === false ||
peertubeLocalStorage.getItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY) === 'true' peertubeLocalStorage.getItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY) === 'true'
) { ) {
this.hasAlreadyAcceptedPrivacyConcern = true this.hasAlreadyAcceptedPrivacyConcern = true

2
client/src/main.ts
View File

@ -34,7 +34,7 @@ const bootstrap = () => platformBrowserDynamic()
// .catch(err => console.error('Cannot register service worker.', err)) // .catch(err => console.error('Cannot register service worker.', err))
// } // }
if (navigator.serviceWorker) { if (navigator.serviceWorker && typeof navigator.serviceWorker.getRegistrations === 'function') {
navigator.serviceWorker.getRegistrations() navigator.serviceWorker.getRegistrations()
.then(registrations => { .then(registrations => {
for (const registration of registrations) { for (const registration of registrations) {

1158
client/yarn.lock
View File

File diff suppressed because it is too large Load Diff