mirror of
https://github.com/LBRYFoundation/lbry-desktop.git
synced 2025-08-23 17:47:24 +00:00
fix replay select styling make meme a link Fix audio references get newest livestream claim in livestreamLink pin crackermilk fix livestream banner placement fix live page fix rebase fix rebase fix error nag fix darkmode blockquote style break word on livestream comment text fix dark mode snack fix live badge fix lint small fixes - word wrap, live badge wip Fix invisible snack in Odysee Light Theme Revert "wip" This reverts commit d17e477fe0e6633709ea30bdc403448825db4c71. Revert "small fixes - word wrap, live badge" This reverts commit 0e431d4038d774079c78f0de32238aac7260e4ca. fix blank pinned destiny fix badges and homepage again only get livestreams live for less than a day pinned hammy and olivia multi pin pin destiny updated pinned videos update tagline Update view.jsx pins updated destiny's video updated pinned videos removed destiny, added lie likes music pinned destiny and mason's woodshop removed hammy and olivia unpinned mason's woodshop removed pins added hammy and olivia pinned sam seder unpinned destiny and hammy and olivia Fix merge on ChannelThumbnails - sam seder, + hammy & olivia and passion for food update tagline (#6086) removed everyone, added kona and suba Theme color fixes (odysee) (#6089) * Cherry-pick master's 'base-theme.scss' * Non-functional cleanup (remove dups, re-order, etc.) * Dark: update positive Toast to --color-primary as well. This follows the intention of the refactoring, which I guess was (1) reduce the number of color names (2) reduce the number of customizations needed. The only issue I have with this is that the current Odysee primary color is pink, which can be intepreted as an error. The original (pre-refactoring color was green). For now, I follow the refactoring path. We can tweak this later. * Fix text color inside '--color-card-background-highlighted' Light: use base-theme (it was the same value anyway). Dark: use bright text. * Dark: add some contrast between the components The color for the background, header, card, placeholder, etc. is almost identical -- it looks like there are all in the same component. The almost-invisible border doesn't help. One would have to crank up the monitor's contrast setting to see separation of components. Brighten up the components a bit, somewhat following the same scale as lbry.tv's dark theme. Overall, I still think it's too dark. The Card's background color can still be brightened up further for better contrast, but I try not to make too drastic of a change for now. The original lbry.tv's gray theme is the most pleasant theme I've seen so far, but this is all subjective. changed pins removed kona and suba added destiny changed pins removed destiny pinned sgtducky changed pins removed sgtducky added hammy and olivia added chrissie mayr added the bite shot changed pins removed the bite shot added heads of tech changed pins removed hammy and olivia removed chrissie mayr changed pins removed heads of tech added crackermilk changed pins removed crackermilk added some ordinary gamer added passion for food changed pins removed some ordinary gamers removed passion for food added emmy hucker changed pins added game knights Update view.jsx Force rebuild changed pins removed emmy hucker changed pins removed game knights added crackermilk changed pins removed crackermilk added some ordinary gamer changed pins removed some ordinary gamers added passion for food added green renaissance changed pins removed passion for food removed green renaissance added expand love changed pins removed expand love added dr nora change tagline (#6122) there's so much room for activities comment out music changed pins removed dr nora added kona and suba changed pins removed kona and suba added destiny changed pins removed destiny added crackermilk changed pins removed crackermilk added someordinarygamers change tagline Drake, where's the door hole? changed pins unpinned someordinarygamers pinned kona and suba Add message for mature content changed pin changed pins removed creative model changed pins added bcpov added krish mohan added cigarvixen changed pins removed krish mohan added adrian logan bump fix footer change tagline just like the simulations changed pins removed: bcpov cigarvixen adrian logan added: someordinarygamers quick fix for reposts oops fix channel tabs changed pin removed someordinarygamers added kona and suba changed pins removed kona and suba added dirtyworkz added crackermilk fix channel tabs again again changed pins someordinarygamers arvie's cookbook changed pins removed some ordinary gamers removed arvie's cookbook added fna van life changed pins removed fna vanlife added game knights change tagline "this cave is not a natural formation" changed pins removed game knights added some ordinary gamers fix popup put footer back bump lightouse throttle bump lighthouse throttle changed pins removed some orginary gamers added adrian logan pinned bret weinstein fix referral fix-superchats changed pins removed bret weinstein added passion for food added dark horse clips fix incorrect variable being used to determine view state changed pins removed passion for food changed pins removed bret weinstein added sgt ducky add recsys related functionality Create plugin to hold code for recsys send recsys on dispose cleanup recsys code add userId to props validation appease the linter add todo note extra characters pinned jungle survival fix autoplay for transcoded files change tagline changed pins pinned destiny pinned chris williamson FIX video.js event firing issues fore RecsysPlugin - The `rateChange` event now logs the updated speed, not just the time at which it occurred. - The `scrub` now (more) accurately logs the position it came from before the destination. - The recsys events get consolidated for logical consistency. Wunderbar: change throttle to debounce + add min chars 6314: prevent lighthouse spam from wunderbar - Wunderbar: change throttle to debounce + add min chars. - useLighthouse: added option to not throttle. Wunderbar: immediate feedback to convey status Make immediate GUI feedback to convey the current status, which can be the following: - typing - waiting lighthouse results - waiting claim resolve - no results or failed. pinned someordinarygamers Wunderbar: bump debounce to 1s per feedback pinned jungle survival pinned james julier
284 lines
8.5 KiB
JavaScript
284 lines
8.5 KiB
JavaScript
// Created by xander on 6/21/2021
|
|
import videojs from 'video.js/dist/video.min.js';
|
|
import { v4 as uuidV4 } from 'uuid';
|
|
const VERSION = '0.0.1';
|
|
|
|
const recsysEndpoint = 'https://clickstream.odysee.com/log/video/view';
|
|
const recsysId = 'lighthouse-v0';
|
|
|
|
/* RecSys */
|
|
const RecsysData = {
|
|
event: {
|
|
start: 0,
|
|
stop: 1,
|
|
scrub: 2,
|
|
speed: 3,
|
|
},
|
|
};
|
|
|
|
function createRecsys(claimId, userId, events, loadedAt, isEmbed) {
|
|
// TODO: use a UUID generator
|
|
const uuid = uuidV4();
|
|
const pageLoadedAt = loadedAt;
|
|
const pageExitedAt = Date.now();
|
|
return {
|
|
uuid: uuid,
|
|
parentUuid: null,
|
|
uid: userId,
|
|
claimId: claimId,
|
|
pageLoadedAt: pageLoadedAt,
|
|
pageExitedAt: pageExitedAt,
|
|
recsysId: recsysId,
|
|
recClaimIds: null,
|
|
recClickedVideoIdx: null,
|
|
events: events,
|
|
isEmbed: isEmbed,
|
|
};
|
|
}
|
|
|
|
function newRecsysEvent(eventType, offset, arg) {
|
|
if (arg) {
|
|
return {
|
|
event: eventType,
|
|
offset: offset,
|
|
arg: arg,
|
|
};
|
|
} else {
|
|
return {
|
|
event: eventType,
|
|
offset: offset,
|
|
};
|
|
}
|
|
}
|
|
|
|
function sendRecsysEvents(recsys) {
|
|
const requestOptions = {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'text/plain' }, // application/json
|
|
body: JSON.stringify(recsys),
|
|
};
|
|
|
|
try {
|
|
fetch(recsysEndpoint, requestOptions)
|
|
.then((response) => response.json())
|
|
.then((data) => {
|
|
// console.log(`Recsys response data:`, data);
|
|
});
|
|
} catch (error) {
|
|
// console.error(`Recsys Error`, error);
|
|
}
|
|
}
|
|
|
|
const defaults = {
|
|
endpoint: recsysEndpoint,
|
|
recsysId: recsysId,
|
|
videoId: null,
|
|
userId: 0,
|
|
debug: false,
|
|
};
|
|
|
|
const Component = videojs.getComponent('Component');
|
|
const registerPlugin = videojs.registerPlugin || videojs.plugin;
|
|
|
|
class RecsysPlugin extends Component {
|
|
constructor(player, options) {
|
|
super(player, options);
|
|
|
|
// Plugin started
|
|
if (options.debug) {
|
|
this.log(`Created recsys plugin for: videoId:${options.videoId}, userId:${options.userId}`);
|
|
}
|
|
|
|
// To help with debugging, we'll add a global vjs object with the video js player
|
|
window.vjs = player;
|
|
|
|
this.player = player;
|
|
|
|
this.recsysEvents = [];
|
|
this.lastTimeUpdate = null;
|
|
this.currentTimeUpdate = null;
|
|
this.loadedAt = Date.now();
|
|
this.playInitiated = false;
|
|
|
|
// Plugin event listeners
|
|
player.on('playing', (event) => this.onPlay(event));
|
|
player.on('pause', (event) => this.onPause(event));
|
|
player.on('ended', (event) => this.onEnded(event));
|
|
player.on('ratechange', (event) => this.onRateChange(event));
|
|
player.on('timeupdate', (event) => this.onTimeUpdate(event));
|
|
player.on('seeked', (event) => this.onSeeked(event));
|
|
|
|
// Event trigger to send recsys event
|
|
player.on('dispose', (event) => this.onDispose(event));
|
|
}
|
|
|
|
addRecsysEvent(recsysEvent) {
|
|
if (!this.playInitiated) {
|
|
switch (recsysEvent.event) {
|
|
case RecsysData.event.start:
|
|
this.playInitiated = true;
|
|
break;
|
|
case RecsysData.event.scrub:
|
|
// If playback hasn't started, swallow scrub events. They offer some
|
|
// information, but if there isn't a subsequent play event, it's
|
|
// mostly nonsensical.
|
|
return undefined;
|
|
case RecsysData.event.stop:
|
|
// If playback hasn't started, swallow stop events. This means
|
|
// you're going to start from an offset but the start event
|
|
// captures that information. (With the ambiguity that you can't
|
|
// tell if they scrubbed, landed at the offset, or restarted. But
|
|
// I don't think that matters much.)
|
|
return undefined;
|
|
case RecsysData.event.speed:
|
|
if (this.recsysEvents.length > 0 && this.recsysEvents[0].event === RecsysData.event.speed) {
|
|
// video.js will sometimes fire the default play speed followed by the
|
|
// user preference. This is not useful information so we can keep the latter.
|
|
this.recsysEvents.pop();
|
|
}
|
|
}
|
|
} else {
|
|
const lastEvent = this.recsysEvents[this.recsysEvents.length - 1];
|
|
|
|
switch (recsysEvent.event) {
|
|
case RecsysData.event.scrub:
|
|
if (lastEvent.event === RecsysData.event.stop) {
|
|
// Video.js fires a stop before the seek. This extra information isn't
|
|
// useful to log though, so this code prunes the stop event if it was
|
|
// within 0.25 seconds.
|
|
if (Math.abs(lastEvent.offset - recsysEvent.offset) < 0.25) {
|
|
this.recsysEvents.pop();
|
|
recsysEvent.offset = lastEvent.arg;
|
|
}
|
|
} else if (lastEvent.event === RecsysData.event.start) {
|
|
// If the last event was a play and this event is a scrub close to
|
|
// that play position, I think it's just a weird emit order for
|
|
// video.js and we don't need to log the scrub.
|
|
if (Math.abs(lastEvent.offset - recsysEvent.arg) < 0.25) {
|
|
return undefined;
|
|
}
|
|
}
|
|
break;
|
|
case RecsysData.event.start:
|
|
if (lastEvent.event === RecsysData.event.scrub) {
|
|
// If the last event was a seek and this is a play,
|
|
// it's reasonable to just implicitly assume the play occurred,
|
|
// no need to create the play event.
|
|
return undefined;
|
|
} else if (lastEvent.event === RecsysData.event.start) {
|
|
// A start followed by a start is a buffering event.
|
|
// It may make sense to keep these. A user may abandon
|
|
// a page *not because it's bad content but because
|
|
// there are network troubles right now*.
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
this.recsysEvents.push(recsysEvent);
|
|
}
|
|
|
|
getRecsysEvents() {
|
|
return this.recsysEvents.map((event) => {
|
|
if (event !== RecsysData.event.stop) {
|
|
return event;
|
|
}
|
|
|
|
// I used the arg in stop events to smuggle the seek time into
|
|
// the scrub events. But the backend doesn't expect it.
|
|
const dup = { ...event };
|
|
delete dup.arg;
|
|
return dup;
|
|
});
|
|
}
|
|
|
|
sendRecsysEvents() {
|
|
const event = createRecsys(
|
|
this.options_.videoId,
|
|
this.options_.userId,
|
|
this.getRecsysEvents(),
|
|
this.loadedAt,
|
|
false
|
|
);
|
|
sendRecsysEvents(event);
|
|
}
|
|
|
|
onPlay(event) {
|
|
const recsysEvent = newRecsysEvent(RecsysData.event.start, this.player.currentTime());
|
|
this.log('onPlay', recsysEvent);
|
|
this.addRecsysEvent(recsysEvent);
|
|
}
|
|
|
|
onPause(event) {
|
|
// The API doesn't want an `arg` for `STOP` events. However, video.js
|
|
// emits these before the seek events, and that seems to be the easiest
|
|
// way to lift time you are seeking from into the scrub record (via lastTimeUpdate).
|
|
// Hacky, but works.
|
|
const recsysEvent = newRecsysEvent(RecsysData.event.stop, this.player.currentTime(), this.lastTimeUpdate);
|
|
this.log('onPause', recsysEvent);
|
|
this.addRecsysEvent(recsysEvent);
|
|
}
|
|
|
|
onEnded(event) {
|
|
const recsysEvent = newRecsysEvent(RecsysData.event.stop, this.player.currentTime());
|
|
this.log('onEnded', recsysEvent);
|
|
this.addRecsysEvent(recsysEvent);
|
|
}
|
|
|
|
onRateChange(event) {
|
|
// This is actually a bug. The offset should be the offset. The change speed should be change speed.
|
|
// Otherise, you don't know where it changed and the time calc is wrong.
|
|
const recsysEvent = newRecsysEvent(RecsysData.event.speed, this.player.currentTime(), this.player.playbackRate());
|
|
this.log('onRateChange', recsysEvent);
|
|
this.addRecsysEvent(recsysEvent);
|
|
}
|
|
|
|
onTimeUpdate(event) {
|
|
this.lastTimeUpdate = this.currentTimeUpdate;
|
|
this.currentTimeUpdate = this.player.currentTime();
|
|
}
|
|
|
|
onSeeked(event) {
|
|
// The problem? `lastTimeUpdate` is wrong.
|
|
// So every seeks l
|
|
|
|
// If the immediately prior event is a pause?
|
|
const recsysEvent = newRecsysEvent(RecsysData.event.scrub, this.lastTimeUpdate, this.player.currentTime());
|
|
this.log('onSeeked', recsysEvent);
|
|
this.addRecsysEvent(recsysEvent);
|
|
}
|
|
|
|
onDispose(event) {
|
|
this.sendRecsysEvents();
|
|
}
|
|
|
|
log(...args) {
|
|
if (this.options_.debug) {
|
|
console.log(`Recsys Debug:`, JSON.stringify(args));
|
|
}
|
|
}
|
|
}
|
|
|
|
videojs.registerComponent('recsys', RecsysPlugin);
|
|
|
|
const onPlayerReady = (player, options) => {
|
|
player.recsys = new RecsysPlugin(player, options);
|
|
};
|
|
|
|
/**
|
|
* Initialize the plugin.
|
|
*
|
|
* @function plugin
|
|
* @param {Object} [options={}]
|
|
*/
|
|
const plugin = function (options) {
|
|
this.ready(() => {
|
|
onPlayerReady(this, videojs.mergeOptions(defaults, options));
|
|
});
|
|
};
|
|
|
|
plugin.VERSION = VERSION;
|
|
|
|
registerPlugin('recsys', plugin);
|
|
|
|
export default plugin;
|