+ 
+
+
@@ -152,19 +152,6 @@ Weblate also allows you to log-in with major SSO providers like Github, Gitlab,
- [HoloPlay](https://github.com/stephane-r/HoloPlay): Funny Android application connecting on Invidious API's with search, playlists and favorites.
-## Contact the team directly
-
-Every team member is available through GitHub or through the Matrix room (bridged to IRC), however, if you need/have to, you can contact the team directly via e-mail (remove `+SPAMGUARD` from the addresses):
-
-- General Inquiries (forwarded to all team members): `contact +SPAMGUARD [at] invidious [dot] io`
-
-Note: before sending a bug report please check that it hasn't already be reported on GitHub - bug reports sent to this address will be copied to GitHub
-
-- Security issues (forwarded to the two project owners, @TheFrenchGhosty and @Perflyst): `security +SPAMGUARD [at] invidious [dot] io`
-
-Note: the creation of a PGP key for this address is planned
-
-
## Liability
We take no responsibility for the use of our tool, or external instances
diff --git a/assets/js/handlers.js b/assets/js/handlers.js
index d3957b89..02175957 100644
--- a/assets/js/handlers.js
+++ b/assets/js/handlers.js
@@ -150,13 +150,13 @@
// Ignore shortcuts if any text input is focused
let focused_tag = document.activeElement.tagName.toLowerCase();
- let focused_type = document.activeElement.type.toLowerCase();
- let allowed = /^(button|checkbox|file|radio|submit)$/;
+ const allowed = /^(button|checkbox|file|radio|submit)$/;
- if (focused_tag === "textarea" ||
- (focused_tag === "input" && !focused_type.match(allowed))
- )
- return;
+ if (focused_tag === "textarea") return;
+ if (focused_tag === "input") {
+ let focused_type = document.activeElement.type.toLowerCase();
+ if (!focused_type.match(allowed)) return;
+ }
// Focus search bar on '/'
if (event.key == "/") {
diff --git a/assets/js/player.js b/assets/js/player.js
index 66d1682f..a1a2cd16 100644
--- a/assets/js/player.js
+++ b/assets/js/player.js
@@ -35,21 +35,11 @@ if (player_data.aspect_ratio) {
var embed_url = new URL(location);
embed_url.searchParams.delete('v');
-short_url = location.origin + '/' + video_data.id + embed_url.search;
+var short_url = location.origin + '/' + video_data.id + embed_url.search;
embed_url = location.origin + '/embed/' + video_data.id + embed_url.search;
var save_player_pos_key = "save_player_pos";
-var shareOptions = {
- socials: ['fbFeed', 'tw', 'reddit', 'email'],
-
- url: short_url,
- title: player_data.title,
- description: player_data.description,
- image: player_data.thumbnail,
- embedCode: ""
-}
-
videojs.Vhs.xhr.beforeRequest = function(options) {
if (options.uri.indexOf('videoplayback') === -1 && options.uri.indexOf('local=true') === -1) {
options.uri = options.uri + '?local=true';
@@ -59,34 +49,55 @@ videojs.Vhs.xhr.beforeRequest = function(options) {
var player = videojs('player', options);
-const storage = (() => {
- try {
- if (localStorage.length !== -1) {
- return localStorage;
- }
- } catch (e) {
- console.info('No storage available: ' + e);
+/**
+ * Function for add time argument to url
+ * @param {String} url
+ * @returns urlWithTimeArg
+ */
+function addCurrentTimeToURL(url) {
+ var urlUsed = new URL(url);
+ urlUsed.searchParams.delete('start');
+ var currentTime = Math.ceil(player.currentTime());
+ if (currentTime > 0)
+ urlUsed.searchParams.set('t', currentTime);
+ else if (urlUsed.searchParams.has('t'))
+ urlUsed.searchParams.delete('t');
+ return urlUsed;
+}
+
+var shareOptions = {
+ socials: ['fbFeed', 'tw', 'reddit', 'email'],
+
+ get url() {
+ return addCurrentTimeToURL(short_url);
+ },
+ title: player_data.title,
+ description: player_data.description,
+ image: player_data.thumbnail,
+ get embedCode() {
+ return "";
}
+};
+
+const storage = (() => {
+ try { if (localStorage.length !== -1) return localStorage; }
+ catch (e) { console.info('No storage available: ' + e); }
+
return undefined;
})();
if (location.pathname.startsWith('/embed/')) {
+ var overlay_content = '#{translate(locale, "Download is disabled.")}
" + end + + return String.build(4000) do |str| + str << "
<% if plid = env.get?("remove_playlist_items") %>
diff --git a/src/invidious/views/edit_playlist.ecr b/src/invidious/views/edit_playlist.ecr
index 308bd677..89819ef0 100644
--- a/src/invidious/views/edit_playlist.ecr
+++ b/src/invidious/views/edit_playlist.ecr
@@ -41,7 +41,7 @@