Skip to content

Commit

Permalink
User can attach messages to alerts using triggers, temporary disable …
Browse files Browse the repository at this point in the history 
…preload comments
  • Loading branch information
tuxfoo committed May 27, 2021
1 parent 9e96b76 commit 44c5692
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 38 deletions.
25 changes: 24 additions & 1 deletion bundles/odysee-simple-alerts-connector/dashboard/panel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@
logicOption.appendChild(logicOptionLabel);
selectLogic.appendChild(logicOption);

var attach = document.createElement('label');
attach.setAttribute('for', 'attach' + index);
var attachLabel = document.createTextNode("Attach User Message: ");
attach.appendChild(attachLabel);
var attachMsg = document.createElement('input');
attachMsg.setAttribute('id', 'attach' + index);
attachMsg.setAttribute('type', 'checkbox');

var logicSubmit = document.createElement('button');
logicSubmit.setAttribute('type', 'submit');
logicSubmit.setAttribute('id', 'logicBtn' + index);
Expand All @@ -150,6 +158,9 @@
form.appendChild(amount);
form.appendChild(amountInput);
form.appendChild(document.createElement("br"));
form.appendChild(attach);
form.appendChild(attachMsg);
form.appendChild(document.createElement("br"));
form.appendChild(logicSubmit);
form.appendChild(logicDelete);
form.appendChild(document.createElement("br"));
Expand All @@ -158,7 +169,14 @@
document.getElementById('alertinput' + index).value = value.name;
document.getElementById('amountinput' + index).value = value.amount;
document.getElementById('selectLogic' + index).value = value.type;

document.getElementById('attach' + index).value = value.attach;
if (typeof value.attach != 'undefined') {
if (value.attach = true) {
document.getElementById('attach' + index).checked = true;
} else {
document.getElementById('attach' + index).checked = false;
}
}
// Delete alert
document.getElementById('deleteBtn' + index).addEventListener('click', e => {
console.log("remove " + index);
Expand All @@ -171,6 +189,11 @@
value.name = document.getElementById('alertinput' + index).value;
value.amount = document.getElementById('amountinput' + index).value;
value.type = document.getElementById('selectLogic' + index).value;
if (document.getElementById('attach' + index).checked == true) {
value.attach = true;
} else {
value.attach = false;
}
});
}

Expand Down
121 changes: 85 additions & 36 deletions bundles/odysee-simple-alerts-connector/extension/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const WebSocket = require('ws');
const got = require('got');
const request = require('request');
const got = require('got');
'use strict';

module.exports = function (nodecg) {
Expand All @@ -20,8 +20,12 @@ module.exports = function (nodecg) {
const equals = [];

// simple-alerts Rest API Request to add on alert to queue
function activateAlert(alertname, username, amount) {
var myJSONObject = {"name": alertname, "message":"(" + username + ") tipped (" + amount + ") LBC"};
function activateAlert(alertname, username, amount, attach) {
if (attach != "") {
var myJSONObject = {"name": alertname, "message":"(" + username + ") tipped (" + amount + ") LBC", "attachMsg": attach};
} else {
var myJSONObject = {"name": alertname, "message":"(" + username + ") tipped (" + amount + ") LBC"};
}
request({
url: 'http://localhost:9090/simple-alerts/alert',
method: "POST",
Expand Down Expand Up @@ -106,35 +110,58 @@ module.exports = function (nodecg) {
return (alertName);
}

function hasAttach(alert) {
var attach = false;
for (const value of triggers.value) {
if (value.name == alert) {
if (typeof value.attach != 'undefined') {
if (value.attach == true) {
attach = true;
break;
}
}
}
}
return attach;
}

function preloadChat(claimid) {
var url = 'https://comments.lbry.com/api'
// Get comment history
var myJSONObject = {
var myJSONObject = `{
"jsonrpc": "2.0",
"id": null,
"id": "null",
"method": "get_claim_comments",
"params": {
"claim_id": claimid,
"page_size": 15,
"claim_id": "` + claimid + `",
"page_size": 5,
"is_channel_signature_valid": true,
"visible": true
}
};
request({
url: 'https://comments.lbry.com/api',
method: "POST",
json: true,
body: myJSONObject
}, function (error, response, body){
nodecg.log.info("Preloading Comment");
}`;
const response = got(
url,
{
timeout: 1000, retry: 1,
headers: {'Content-Type': 'application/json' },
body: myJSONObject, json: true
}
).then(res => {
nodecg.log.info("Preloading Comments");
(async function() {
try {
for (var i = 0, j = body.result.items.length - 1; i < body.result.items.length; i++, j--) {
await addComment(body.result.items[j]);
for (var i = 0, j = res.body.result.items.length - 1; i < res.body.result.items.length; i++, j--) {
if (await addComment(res.body.result.items[j]) == false) {
nodecg.log.info("Skipping comment preload");
break;
}
}
} catch {
nodecg.log.info("There does not appear to be any prevoius comments to load. Skipping...");
nodecg.log.info("There does not appear to be any previous comments to load. Skipping...");
}
})();
}).catch(err => {
nodecg.log.info("Timed out, not adding past message. LBRY API server might be down.");
});
}

Expand All @@ -149,21 +176,30 @@ module.exports = function (nodecg) {
"comment_id": "` + value.comment_id + `"
}
}`;
var username = "";
try {
const response = await got.post(url, { headers: {'Content-Type': 'application/json'}, body: myJSONObject, json: true});
username = response.body.result.channel_name;
var comment = value.comment;
if (value.support_amount > 0) {
var extra = { class: "tipmsg", message: "Tipped " + value.support_amount + " LBC"};
} else {
var extra = { class: "message-wrap", message: ""};
}
addhistory(username, comment, extra);
nodecg.log.info(username + ":" + comment);
} catch (error) {
nodecg.log.info("Failed to fetch get channel name.")
var username = "";
var success = true;
const response = await got.post(
url,
{
timeout: 1000, retry: 1,
headers: {'Content-Type': 'application/json' },
body: myJSONObject, json: true
}
).then(res => {
username = res.body.result.channel_name;
var comment = value.comment;
if (value.support_amount > 0) {
var extra = { class: "tipmsg", message: "Tipped " + value.support_amount + " LBC"};
} else {
var extra = { class: "message-wrap", message: ""};
}
addhistory(username, comment, extra);
nodecg.log.info(username + ":" + comment);
}).catch(err => {
success = false;
nodecg.log.info("Timed out, not adding past message. LBRY API server might be down.");
});
return success;
}

triggers.on('change', value => {
Expand All @@ -188,6 +224,7 @@ module.exports = function (nodecg) {

function isOpen() {
if (socket.readyState != WebSocket.OPEN) {
socket.close();
nodecg.log.info("Timed out, Reconnecting....");
getClaimid();
}
Expand All @@ -197,24 +234,26 @@ module.exports = function (nodecg) {
var url = "https://chainquery.lbry.com/api/sql?query=SELECT%20*%20FROM%20claim%20WHERE%20publisher_id=%22" + claim_id.value + "%22%20AND%20bid_state%3C%3E%22Spent%22%20AND%20claim_type=1%20AND%20source_hash%20IS%20NULL%20ORDER%20BY%20id%20DESC%20LIMIT%201";
var currentClaimid = (async () => {
try {
const response = await got(url, { json: true });
const response = await got(url, { json: true, timeout: 2000, retry: 1 });
if (response.body.data.length === 0) {
nodecg.log.info("Array is empty, assuming claim id is for livestream.");
//preloadChat(claim_id.value);
reconnect(claim_id.value);
} else {
nodecg.log.info("Array should have claim id");
nodecg.log.info(response.body.data[0].claim_id);
//preloadChat(response.body.data[0].claim_id);
reconnect(response.body.data[0].claim_id);
}
} catch (error) {
nodecg.log.info("Failed to fetch claim id from publisher id, assuming claim id is for livestream.")
//preloadChat(claim_id.value);
reconnect(claim_id.value);
}
})();
}

function reconnect(claimid) {
preloadChat(claimid);
nodecg.log.info("Connecting using " + claimid);
socket = new WebSocket('wss://comments.lbry.com/api/v2/live-chat/subscribe?subscription_id=' + claimid);
// Connection opened
Expand All @@ -238,7 +277,12 @@ module.exports = function (nodecg) {
addToGoal(amount);
addToTicker(userName, amount);
alertName = checkTriggers(amount, alertName);
activateAlert(alertName, userName, amount);
// Add if else to see if alert has attach enabled.
if (hasAttach(alertName) == true) {
activateAlert(alertName, userName, amount, msg);
} else {
activateAlert(alertName, userName, amount, "");
}
sendToLog(userName, msg, {class: "tipmsg", message: "Tipped " + amount + " LBC"});
addhistory(userName, msg, {class: "tipmsg", message: "Tipped " + amount + " LBC"});
} else {
Expand All @@ -263,7 +307,12 @@ module.exports = function (nodecg) {
test.on('change', value => {
var alertName = defaultTrigger.value;
alertName = checkTriggers(value.amount, alertName);
activateAlert(alertName, "Slyver Testallone", value.amount);
if (hasAttach(alertName) == true) {
nodecg.log.info("has attached message.")
activateAlert(alertName, "Slyver Testallone", value.amount, "Hello World, Is that a Bird, or a plane? No, its just Bob.");
} else {
activateAlert(alertName, "Slyver Testallone", value.amount, "");
}
});

};
2 changes: 1 addition & 1 deletion bundles/simple-alerts
Submodule simple-alerts updated 4 files
+7 −1 README.md
+13 −4 extension/index.js
+3 −0 graphics/css/tip.css
+59 −31 graphics/index.html

0 comments on commit 44c5692

Please sign in to comment.