Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Commit

Permalink
v2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Arubinu committed Mar 19, 2023
1 parent 989cc85 commit 702b540
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 23 deletions.
2 changes: 1 addition & 1 deletion docs/pages/EN/v2.1/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2>
</h2>

<p>
The version is the one presented in this documentation: <a href="https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.0" target="_blank">https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.0</a>.
The version is the one presented in this documentation: <a href="https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.1" target="_blank">https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.0</a>.
<br />But you can check all versions here: <a href="https://github.com/Arubinu/Scripts-Manager/releases" target="_blank">https://github.com/Arubinu/Scripts-Manager/releases</a>.
<br /><br />You will find the software to download in the <code>Assets</code> part (this is not an installer but the complete software).
<br />Put the software where you want to leave it before launching it, avoid folders where there is a request for administrator access (this software will never ask you for this kind of rights).
Expand Down
5 changes: 5 additions & 0 deletions docs/pages/EN/v2.1/multi-actions.html
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ <h3>
</ul>
<br /><img src="./images/multi-actions/input.webp" width="12" alt="" /> This block receives the following variables:
<ul>
<li><u class="underline-gray">discord:webhook:id <span class="text-lime"><i>(type: String)</i></span>:</u> id of the message to be edited.</li>
<li><u class="underline-gray">discord:thumbnail <span class="text-lime"><i>(type: String)</i></span>:</u> replace message thumbnail if not set.</li>
<li><u class="underline-gray">discord:big-image <span class="text-lime"><i>(type: String)</i></span>:</u> replaces the large message image if not set.</li>
</ul>
Expand Down Expand Up @@ -702,6 +703,10 @@ <h3>
<li><u class="underline-gray">discord:webhook:mention:everyone <span class="text-lime"><i>(scope: Next, type: Boolean)</i></span>:</u> if the message mentioned all users of the server.</li>
<li><u class="underline-gray">discord:webhook:embeds:count <span class="text-lime"><i>(scope: Next, type: Number)</i></span>:</u> number of message blocks present in this message (<code>0</code> in this case).</li>
</ul>
<br /><img src="./images/multi-actions/input.webp" width="12" alt="" /> This block receives the following variables:
<ul>
<li><u class="underline-gray">discord:webhook:id <span class="text-lime"><i>(type: String)</i></span>:</u> id of the message to be edited.</li>
</ul>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/FR/v2.1/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2>
</h2>

<p>
La version est celle présenté dans cette documentation: <a href="https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.0" target="_blank">https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.0</a>.
La version est celle présenté dans cette documentation: <a href="https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.1" target="_blank">https://github.com/Arubinu/Scripts-Manager/releases/tag/v2.1.0</a>.
<br />Mais vous pouvez consulter toutes les versions ici: <a href="https://github.com/Arubinu/Scripts-Manager/releases" target="_blank">https://github.com/Arubinu/Scripts-Manager/releases</a>.
<br /><br />Vous trouverez le logiciel à télécharger dans la partie <code>Assets</code> (ceci n'est pas un installeur mais le logiciel complet).
<br />Mettez le logiciel à l'endroit où vous voulez le laisser avant de le lancer, évitez les dossiers où il y a une demande d'accès administrateur (ce logiciel ne vous demandera jamais ce genre de droits).
Expand Down
5 changes: 5 additions & 0 deletions docs/pages/FR/v2.1/multi-actions.html
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ <h3>
</ul>
<br /><img src="./images/multi-actions/input.webp" width="12" alt="" /> Ce bloc reçoit les variables suivantes:
<ul>
<li><u class="underline-gray">discord:webhook:id <span class="text-lime"><i>(type: Texte)</i></span>:</u> identifiant du message à éditer.</li>
<li><u class="underline-gray">discord:thumbnail <span class="text-lime"><i>(type: Texte)</i></span>:</u> remplacer la vignette du message si elle n'est pas définie.</li>
<li><u class="underline-gray">discord:big-image <span class="text-lime"><i>(type: Texte)</i></span>:</u> remplace la grande image du message si elle n'est pas définie.</li>
</ul>
Expand Down Expand Up @@ -703,6 +704,10 @@ <h3>
<li><u class="underline-gray">discord:webhook:mention:everyone <span class="text-lime"><i>(scope: Next, type: Booléen)</i></span>:</u> si le message a mentionné tous les utilisateurs du serveur.</li>
<li><u class="underline-gray">discord:webhook:embeds:count <span class="text-lime"><i>(scope: Next, type: Nombre)</i></span>:</u> nombre de blocs de message présents dans ce message (<code>0</code> dans ce cas).</li>
</ul>
<br /><img src="./images/multi-actions/input.webp" width="12" alt="" /> Ce bloc reçoit les variables suivantes:
<ul>
<li><u class="underline-gray">discord:webhook:id <span class="text-lime"><i>(type: Texte)</i></span>:</u> identifiant du message à éditer.</li>
</ul>
</td>
</tr>
</table>
Expand Down
18 changes: 8 additions & 10 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ let win,
menus = {},
addons = {},
exited = false,
manager = {},
manager = { default: {} },
scripts = {},
tpc_state = false,
store_clear = false,
Expand Down Expand Up @@ -247,7 +247,7 @@ function create_server() {

function create_window() {
win = new BrowserWindow({
show: !manager.default || !manager.default.systray,
show: !manager.default.systray,
icon: APP_ICON,
width: 1140,
height: 630,
Expand Down Expand Up @@ -523,10 +523,8 @@ async function save_config(type, id, data, override) {

let config_path = path.join(__dirname, type, id);
if (!fs.existsSync(config_path)) {
if (typeof manager === 'object' && typeof manager.default === 'object') {
if (typeof manager.default.all === 'string') {
config_path = path.join(manager.default.all, type, id);
}
if (typeof manager.default.all === 'string') {
config_path = path.join(manager.default.all, type, id);
}
}

Expand Down Expand Up @@ -555,8 +553,8 @@ async function check_port(port) {
});
s.once('listening', () => {
console.log('listening');
resolve();
s.close();
resolve();
s.close();
});
s.listen(port);
});
Expand Down Expand Up @@ -976,7 +974,7 @@ app.whenReady().then(() => {
});
};

if (typeof manager.default === 'object' && typeof manager.default.all === 'string') {
if (typeof manager.default.all === 'string') {
const scripts_path = path.join(manager.default.all, 'scripts');
if (fs.existsSync(scripts_path)) {
load_scripts(scripts_path).then(next).catch(next);
Expand All @@ -988,7 +986,7 @@ app.whenReady().then(() => {
};

load_manager_config();
if (typeof manager.default === 'object' && typeof manager.default.all === 'string') {
if (typeof manager.default.all === 'string') {
const addons_path = path.join(manager.default.all, 'addons');
if (fs.existsSync(addons_path)) {
load_addons(addons_path).then(next).catch(next);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scripts-manager",
"version": "2.1.0",
"version": "2.1.1",
"description": "Scripts Manager is a tool for streamers, developers, but also anyone who wants to automate actions on their computer.",
"main": "main.js",
"scripts": {
Expand Down
22 changes: 12 additions & 10 deletions scripts/multi-actions/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@ const functions = {
};

const specials = [
'obs-studio-authentification',
'obs-studio-connection',
'obs-studio-recording',
'obs-studio-replay',
'obs-studio-streaming',
'obs-studio-studio-mode',
'obs-studio-switch-scene',
Expand All @@ -328,11 +332,7 @@ const specials = [
'twitch-info',
'twitch-slow',
'twitch-subs-only',
'twitch-unique-message',
'obs-studio-authentification',
'obs-studio-connection',
'obs-studio-recording',
'obs-studio-replay'
'twitch-unique-message'
];

const actions = {
Expand Down Expand Up @@ -993,7 +993,7 @@ const actions = {
if (receive.id === 'obs-studio' && receive.name === 'StudioModeStateChanged') {
set_variable('obs-studio:studio-mode', receive.data.studioModeEnabled, VARIABLE_TYPE.GLOBALS);

if (data.state === receive.data.studioModeEnabled) {
if (typeof next !== 'undefined' && data.state === receive.data.studioModeEnabled) {
next();
}
}
Expand All @@ -1003,10 +1003,10 @@ const actions = {
_sender('obs-studio', 'ToggleStudioMode', [state]);
},
'outputs-obs-studio-switch-scene': (module_name, receive, data, next_data, next) => {
if (data.scene && receive.id === 'obs-studio' && receive.name === 'CurrentProgramSceneChanged') {
if (receive.id === 'obs-studio' && receive.name === 'CurrentProgramSceneChanged') {
set_variable('obs-studio:switch-scene', receive.data.sceneName, VARIABLE_TYPE.GLOBALS);

if (!data.scene || receive.data.sceneName.toLowerCase() === data.scene.toLowerCase()) {
if (typeof next !== 'undefined' && (!data.scene || receive.data.sceneName.toLowerCase() === data.scene.toLowerCase())) {
next();
}
}
Expand Down Expand Up @@ -1131,7 +1131,7 @@ const actions = {
const state = (receive.data.outputState === 'OBS_WEBSOCKET_OUTPUT_STARTED');
set_variable('obs-studio:virtualcam', state, VARIABLE_TYPE.GLOBALS);

if (data.state === state) {
if (typeof next !== 'undefined' && data.state === state) {
next();
}
}
Expand Down Expand Up @@ -1412,7 +1412,9 @@ const actions = {
set_variable('twitch:channel:game:id', receive.data.data.categoryId, VARIABLE_TYPE.GLOBALS);
set_variable('twitch:channel:game:name', receive.data.data.categoryName, VARIABLE_TYPE.GLOBALS);

next();
if (typeof next !== 'undefined') {
next();
}
});
}
},
Expand Down

0 comments on commit 702b540

Please sign in to comment.