diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-03-21 09:17:25 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-03-21 09:17:25 +0100 |
| commit | 951414fc62a40aad4e7295029f3c57489bee2491 (patch) | |
| tree | edb150806fbf3db1bed6b9ba6193d2e92275b751 /client | |
| parent | 1c41b5c1ac798a06fbc0e7a2c6b91c5542865780 (diff) | |
| parent | ae0e4fdbd143966b870678721b60f4fad7c3cbe9 (diff) | |
| download | PeerTube-951414fc62a40aad4e7295029f3c57489bee2491.tar.gz PeerTube-951414fc62a40aad4e7295029f3c57489bee2491.tar.zst PeerTube-951414fc62a40aad4e7295029f3c57489bee2491.zip | |
Merge branch 'release/5.1.0' into develop
Diffstat (limited to 'client')
| -rw-r--r-- | client/package.json | 2 | ||||
| -rw-r--r-- | client/src/assets/player/shared/peertube/peertube-plugin.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/package.json b/client/package.json index 998a27f24..b8b3d4107 100644 --- a/client/package.json +++ b/client/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "peertube-client", | 2 | "name": "peertube-client", |
| 3 | "version": "5.1.0-rc.1", | 3 | "version": "5.1.0", |
| 4 | "private": true, | 4 | "private": true, |
| 5 | "license": "AGPL-3.0", | 5 | "license": "AGPL-3.0", |
| 6 | "author": { | 6 | "author": { |
diff --git a/client/src/assets/player/shared/peertube/peertube-plugin.ts b/client/src/assets/player/shared/peertube/peertube-plugin.ts index da9b3bd0e..cf96b33ba 100644 --- a/client/src/assets/player/shared/peertube/peertube-plugin.ts +++ b/client/src/assets/player/shared/peertube/peertube-plugin.ts | |||
| @@ -216,7 +216,7 @@ class PeerTubePlugin extends Plugin { | |||
| 216 | saveVideoWatchHistory(this.videoUUID, currentTime) | 216 | saveVideoWatchHistory(this.videoUUID, currentTime) |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | if (!this.videoViewUrl) return | 219 | if (!this.videoViewUrl) return Promise.resolve(true) |
| 220 | 220 | ||
| 221 | const body: VideoView = { currentTime, viewEvent } | 221 | const body: VideoView = { currentTime, viewEvent } |
| 222 | 222 | ||