deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-19 22:56:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1806 from MaxLeiter/sound

Browse source 
Support audio file previews
This commit is contained in:
Pavel Djundik 2017-12-13 11:03:04 +02:00 committed by GitHub
parent 234c4a8bac ad1114ccfe
commit 7dcab09516
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/css/style.css
View file

@ -1240,6 +1240,11 @@ kbd {
display: inline-flex !important;
}
#chat audio {
width: 600px;
max-width: 100%;
}
/* Do not display an empty div when there are no previews. Useful for example in
part/quit messages where we don't load previews (adds a blank line otherwise) */
#chat .preview:empty {

4
client/js/options.js
View file

@ -23,7 +23,7 @@ const options = {
showSeconds: false,
statusMessages: "condensed",
theme: $("#theme").attr("href").replace(/^themes\/(.*).css$/, "$1"), // Extracts default theme name, set on the server configuration
thumbnails: true,
media: true,
userStyles: userStyles.text(),
};
let userOptions = JSON.parse(storage.get("settings")) || {};
@ -44,7 +44,7 @@ userOptions = null;
module.exports = options;
module.exports.shouldOpenMessagePreview = function(type) {
return (options.links && type === "link") || (options.thumbnails && type === "image");
return (options.links && type === "link") || (options.media && (type === "image" || type === "audio"));
};
module.exports.initialize = () => {

23
client/views/msg_preview.tpl
View file

@ -5,15 +5,22 @@
<img src="{{thumb}}">
</a>
{{else}}
{{#if thumb}}
<a class="toggle-thumbnail" href="{{link}}" target="_blank" rel="noopener">
<img src="{{thumb}}" class="thumb">
{{#equal type "audio"}}
<audio controls preload="metadata">
<source src="{{link}}" type="{{res}}">
Your browser does not support the audio element.
</audio>
{{else}}
{{#if thumb}}
<a class="toggle-thumbnail" href="{{link}}" target="_blank" rel="noopener">
<img src="{{thumb}}" class="thumb">
</a>
{{/if}}
<a class="toggle-text" href="{{link}}" target="_blank" rel="noopener">
<div class="head" title="{{head}}">{{head}}</div>
<div class="body" title="{{body}}">{{body}}</div>
</a>
{{/if}}
<a class="toggle-text" href="{{link}}" target="_blank" rel="noopener">
<div class="head" title="{{head}}">{{head}}</div>
<div class="body" title="{{body}}">{{body}}</div>
</a>
{{/equal}}
{{/equal}}
</div>
{{/preview}}

18
src/plugins/irc-events/link.js
View file

@ -106,6 +106,22 @@ function parse(msg, preview, res, client) {
break;
case "audio/midi":
case "audio/mpeg":
case "audio/mpeg3":
case "audio/ogg":
case "audio/wav":
case "audio/x-mid":
case "audio/x-midi":
case "audio/x-mpeg":
case "audio/x-mpeg-3":
if (!preview.link.startsWith("https://")) {
break;
}
preview.type = "audio";
preview.res = res.type;
break;
default:
return;
}
@ -170,6 +186,8 @@ function fetch(uri, cb) {
if (contentLength > limit) {
req.abort();
}
} else if (/^audio\/.+/.test(res.headers["content-type"])) {
req.abort(); // ensure server doesn't download the audio file
} else {
// if not image, limit download to 50kb, since we need only meta tags
// twitter.com sends opengraph meta tags within ~20kb of data for individual tweets