Skip to content

fix interactive notifications icon + exclude platform specific plugins from build #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
th-ch merged 3 commits into from
Feb 13, 2022
Merged

fix interactive notifications icon + exclude platform specific plugins from build #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
271d525
fix interactive notifications icon
Araxeus Feb 1, 2022
1834e1e
Merge branch 'th-ch:master' into update-snoretoast
Araxeus Feb 11, 2022
1b99cc6
use custom snoretoast on release #600
Araxeus Feb 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"productName": "YouTube Music",
"mac": {
"identity": null,
"files": ["!plugins/taskbar-mediacontrol${/*}"],
"target": [
{
"target": "dmg",
Expand All @@ -28,6 +29,7 @@
},
"win": {
"icon": "assets/generated/icons/win/icon.ico",
"files": ["!plugins/touchbar${/*}"],
"target": [
"nsis",
"portable"
Expand All @@ -38,6 +40,7 @@
},
"linux": {
"icon": "assets/generated/icons/png",
"files": ["!plugins/{touchbar,taskbar-mediacontrol}${/*}"],
"category": "AudioVideo",
"target": [
"AppImage",
Expand Down
4 changes: 1 addition & 3 deletions plugins/notifications/back.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ const is = require("electron-is");
const registerCallback = require("../../providers/song-info");
const { notificationImage } = require("./utils");

const setupInteractive = require("./interactive")

const notify = (info, options) => {

// Fill the notification with content
Expand Down Expand Up @@ -41,6 +39,6 @@ const setup = (options) => {
module.exports = (win, options) => {
// Register the callback for new song information
is.windows() && options.interactive ?
setupInteractive(win, options.unpauseNotification) :
require("./interactive")(win, options.unpauseNotification) :
setup(options);
};
19 changes: 11 additions & 8 deletions plugins/notifications/interactive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
const { notificationImage, icons } = require("./utils");
const getSongControls = require('../../providers/song-controls');
const registerCallback = require("../../providers/song-info");
const notifier = require("node-notifier");
const { notificationImage, icons } = require("../utils");
const getSongControls = require('../../../providers/song-controls');
const registerCallback = require("../../../providers/song-info");
const is = require("electron-is");
const WindowsToaster = require('node-notifier').WindowsToaster;

const notifier = new WindowsToaster({ withFallback: true });

//store song controls reference on launch
let controls;
Expand All @@ -17,11 +20,11 @@ module.exports = (win, unpauseNotification) => {

// Register songInfoCallback
registerCallback(songInfo => {
if (!songInfo.isPaused && (songInfo.url !== currentUrl || notificationOnUnpause)) {
if (!songInfo.isPaused && (songInfo.url !== currentUrl || notificationOnUnpause)) {
currentUrl = songInfo.url;
sendToaster(songInfo);
}
});
}
});

win.webContents.once("closed", () => {
deleteNotification()
Expand All @@ -48,7 +51,7 @@ function sendToaster(songInfo) {
//download image and get path
let imgSrc = notificationImage(songInfo, true);
toDelete = {
//app id undefined - will break buttons
appID: is.dev() ? undefined : "com.github.th-ch.youtube-music",
title: songInfo.title || "Playing",
message: songInfo.artist,
id: parseInt(Math.random() * 1000000, 10),
Expand Down