Compare commits

...
Author SHA1 Message Date
Niko Storni 39ea483f08 fix resolution of claims 2019-09-23 23:01:28 +02:00
Niko Storni 6ae0984edf add trending call
use new resolve and trending
remove old trending func
2019-09-23 19:42:21 +02:00
Niko Storni d5932ce67c port resolve call to lbrytv 2019-09-23 19:27:04 +02:00
Thomas Zarebczan 777d9f0f83 Yolo fix to rewards
Will run locally if this doesn't work...
2019-09-12 14:48:54 -04:00
Thomas Zarebczan b3ae6ca0d6 remove auth settings 2019-09-12 12:10:16 -04:00
Thomas Zarebczan ebbcb02c87 Merge pull request #296 from lbryio/devprogram-fixes
Developer program fixes
2019-09-10 13:29:25 -04:00
8 changed files with 243 additions and 122 deletions

No files matched your search

+2 -2
View File
@@ -65,12 +65,12 @@ function syncWithApi(data) { // eslint-disable-line no-unused-vars
.then(response => response.json()) .then(response => response.json())
.then(result => { .then(result => {
switch(true) { switch(true) {
case result.error === "this reward is limited to 1 per person": case result.error === "This reward is limited to 1 per person":
document.querySelector("developer-program").innerHTML = document.querySelector("developer-program").innerHTML =
"<p>You have already claimed this reward. This reward is limited to <strong>ONE</strong> per person. Your enthusiasm is appreciated.</p>"; "<p>You have already claimed this reward. This reward is limited to <strong>ONE</strong> per person. Your enthusiasm is appreciated.</p>";
return; return;
case result.error: case Boolean(result.error):
document.querySelector("developer-program").innerHTML = document.querySelector("developer-program").innerHTML =
`<p>${result.error}</p>`; `<p>${result.error}</p>`;
return; return;
+1 -1
View File
@@ -257,7 +257,7 @@ const handleExamples = debounce(event => {
switch(data.action) { switch(data.action) {
case "choose claim": case "choose claim":
fetchMetadata(exampleNumber, data.claimId); fetchMetadata(exampleNumber, `${data.name}#${data.claimId}`);
if (document.querySelector(".playground-navigation__example:nth-child(3)").classList.contains("active")) if (document.querySelector(".playground-navigation__example:nth-child(3)").classList.contains("active"))
document.getElementById("fetch-claim-uri").value = event.dataset.name + "#" + event.dataset.claimId; document.getElementById("fetch-claim-uri").value = event.dataset.name + "#" + event.dataset.claimId;
+32 -4
View File
@@ -13,6 +13,8 @@ import stringifyObject from "stringify-object";
import messageSlack from "./slack"; import messageSlack from "./slack";
import publishMeme from "./publish-meme"; import publishMeme from "./publish-meme";
import lbrytvAPI from "~helper/lbrytv-sdk";
import randomString from "./random-string"; import randomString from "./random-string";
import { send } from "~socket"; import { send } from "~socket";
import uploadImage from "./upload-image"; import uploadImage from "./upload-image";
@@ -76,10 +78,10 @@ export default async(data, socket) => {
switch(true) { switch(resolveMethod) {
// T I P // T I P
// E X A M P L E // E X A M P L E
case resolveMethod === "support_create": case "support_create":
if (!approvedContentIdsForTipping.includes(claimAddress)) { if (!approvedContentIdsForTipping.includes(claimAddress)) {
return send(socket, { return send(socket, {
example: data.example, example: data.example,
@@ -103,7 +105,7 @@ export default async(data, socket) => {
// P U B L I S H // P U B L I S H
// E X A M P L E // E X A M P L E
case resolveMethod === "publish": case "publish":
apiRequestMethod = "PUT"; apiRequestMethod = "PUT";
// Required for publishing // Required for publishing
@@ -194,10 +196,36 @@ export default async(data, socket) => {
// R E S O L V E // R E S O L V E
// E X A M P L E // E X A M P L E
case resolveMethod === "resolve": case "resolve":
apiRequestMethod = "GET"; apiRequestMethod = "GET";
body.uri = claimAddress; body.uri = claimAddress;
try {
let resolveResponse = await lbrytvAPI.resolve([claimAddress]);
if (socket) {
const renderedCode = prism.highlight(
stringifyObject(resolveResponse, { indent: " ", singleQuotes: false }),
prism.languages.json,
"json"
);
return send(socket, {
example: data.example,
html: raw(`
<h3>Response</h3>
${explorerNotice}
<pre><code class="language-json">${renderedCode}</code></pre>
`),
message: "show result",
selector: `#example${data.example}-result`
});
}
} catch(error) {
messageSlack({
message: "```" + error + "```",
title: "DAEMON ERROR: resolve"
});
}
break; break;
+119
View File
@@ -0,0 +1,119 @@
"use strict";
const request = require("request");
import messageSlack from "./slack";
let addSupport = function() {
return;
};
let publish = function() {
return;
};
let resolve = function(urls) {
return new Promise(function(resolve, reject) {
let options = {
method: "POST",
url: "https://api.lbry.tv/api/proxy",
headers:
{
"Content-Type": "application/json"
},
body: {
method: "resolve",
params: { urls: urls }
},
json: true
};
request(options, function(error, response, daemonResponse) {
if (error) {
messageSlack({
message: "```" + error + "```",
title: "DAEMON ERROR: resolve"
});
return reject("DAEMON ERROR: resolve");
}
if (Object.prototype.hasOwnProperty.call(daemonResponse, "error")) {
messageSlack({
message: "```" + daemonResponse.error + "```",
title: "DAEMON ERROR: resolve"
});
return reject("DAEMON ERROR: resolve");
} else
return resolve(daemonResponse.result);
});
});
};
let getTrending = function() {
return new Promise(function(resolve, reject) {
let options = {
method: "POST",
url: "https://api.lbry.tv/api/proxy",
headers:
{
"Content-Type": "application/json"
},
body:
{
method: "claim_search",
params:
{
page_size: 20,
page: 1,
no_totals: true,
any_tags:
["art",
"automotive",
"blockchain",
"comedy",
"economics",
"education",
"gaming",
"music",
"news",
"science",
"sports",
"technology"],
channel_ids: [],
not_channel_ids: [],
not_tags: ["porn", "nsfw", "mature", "xxx"],
order_by: ["trending_global", "trending_mixed"]
}
},
json: true
};
request(options, function(error, response, daemonResponse) {
if (error) {
messageSlack({
message: "```" + error + "```",
title: "DAEMON ERROR: trending"
});
return reject("DAEMON ERROR: trending");
}
if (Object.prototype.hasOwnProperty.call(daemonResponse, "error")) {
messageSlack({
message: "```" + daemonResponse.error + "```",
title: "DAEMON ERROR: trending"
});
return reject("DAEMON ERROR: trending");
} else
return resolve(daemonResponse.result.items);
});
});
};
export default {
addSupport,
publish,
resolve,
getTrending
};
+1 -1
View File
@@ -4,7 +4,7 @@
// P A C K A G E S // P A C K A G E S
import color from "colorette"; import * as color from "colorette";
import compress from "fastify-compress"; import compress from "fastify-compress";
import cors from "cors"; import cors from "cors";
import fastify from "fastify"; import fastify from "fastify";
+86 -106
View File
@@ -11,6 +11,7 @@ import html from "choo/html";
import apiPage from "~view/api"; import apiPage from "~view/api";
import fetchMetadata from "~helper/fetch-metadata"; import fetchMetadata from "~helper/fetch-metadata";
import lbrytvAPI from "~helper/lbrytv-sdk";
import { generateGitHubFeed } from "~helper/github"; import { generateGitHubFeed } from "~helper/github";
import messageSlack from "~helper/slack"; import messageSlack from "~helper/slack";
import { URL } from "url"; import { URL } from "url";
@@ -117,67 +118,56 @@ export default async(socket, action) => {
function generateContent(exampleNumber, displayTrendingContent) { function generateContent(exampleNumber, displayTrendingContent) {
if (exampleNumber === 1) { if (exampleNumber === 1) {
return getTrendingContent().then(response => { return lbrytvAPI.getTrending()
if (!response || !response.success || response.success !== true || !response.data) .then(response => {
return ""; const renderedContentCollection = [];
const urlsToResolve = [];
const rawContentCollection = []; response.forEach(r =>{
const renderedContentCollection = []; urlsToResolve.push(r.canonical_url);
const trendingContentData = response.data;
for (const data of trendingContentData) {
rawContentCollection.push(fetchMetadata({
claim: data.url,
example: exampleNumber,
method: "resolve"
}));
}
Promise.all(rawContentCollection)
.then(collection => {
for (const part of collection) {
if (part && part.value.tags && part.value.tags.includes("mature"))
continue;
if (part === undefined)
continue;
try {
renderedContentCollection.push(`
<section class="playground-content__trend">
<figure
class="media__thumb"
data-action="choose claim"
data-claim-id="${part.name}"
${part.value.thumbnail.url.length ? `style="background-image: url(${makeImageSourceSecure(part.value.thumbnail.url)})"` : ""}
></figure>
<div class="media__title">
${part.value.title}
</div>
<div class="media__subtitle">
${part.signing_channel ? part.signing_channel.name : "Anon"}
</div>
</section>
`);
} catch(err) {
console.error(err);
return; // TODO: Return nice error message
}
}
renderedContentCollection.push(`
<script>
document.getElementById("playground-example-description").innerHTML = document.querySelector("[data-action='playground, example 1']").dataset.description
</script>
`);
displayTrendingContent(renderedContentCollection.join(""));
})
.catch(error => {
console.error(error);
return null;
}); });
}); lbrytvAPI.resolve(urlsToResolve)
.then(resolveResponse => {
if (resolveResponse !== null) {
let responses = Object.values(resolveResponse);
for (let r in responses) {
let part = responses[r];
if (part.value && part.value.thumbnail.url) {
renderedContentCollection.push(`
<section class="playground-content__trend">
<figure
class="media__thumb"
data-action="choose claim"
data-claim-id="${part.claim_id}"
data-name=${part.name}
style="background-image: url(${makeImageSourceSecure(part.value.thumbnail.url)})">
</figure>
<div class="media__title">
${part.value.title || "Untitled"}
</div>
<div class="media__subtitle">
${part.signing_channel ? part.signing_channel.name : "Anon"}
</div>
</section>
`);
}
}
}
renderedContentCollection.push(`
<script>
document.getElementById("playground-example-description").innerHTML = document.querySelector("[data-action='playground, example 1']").dataset.description
</script>
`);
displayTrendingContent(renderedContentCollection.join(""));
})
.catch(error => {
console.error(error);
});
});
} }
if (exampleNumber === 3) { if (exampleNumber === 3) {
@@ -193,50 +183,49 @@ function generateContent(exampleNumber, displayTrendingContent) {
"minecraft-in-real-life-iron-man#758dd6497cdfc401ae1f25984738d024d47b50af", "minecraft-in-real-life-iron-man#758dd6497cdfc401ae1f25984738d024d47b50af",
"ethan-shows-kyle-warframe-skyvault#8a7401b88d5ed0376d98f16808194d4dcb05b284" "ethan-shows-kyle-warframe-skyvault#8a7401b88d5ed0376d98f16808194d4dcb05b284"
]; ];
const rawContentCollection = [];
const renderedContentCollection = []; const renderedContentCollection = [];
for (const url of approvedUrls) lbrytvAPI.resolve(approvedUrls)
rawContentCollection.push(fetchMetadata({ claim: url, method: "resolve", example: 1 })); .then(resolveResponse => {
if (resolveResponse !== null) {
let responses = Object.values(resolveResponse);
return Promise.all(rawContentCollection).then(collection => { for (let r in responses) {
for (const part of collection) { let part = responses[r];
if (
part &&
part.value &&
part.value.thumbnail.url
) {
renderedContentCollection.push(`
<section class="playground-content__trend">
<figure
class="media__thumb"
data-action="choose claim"
data-claim-id="${part.claim_id}"
data-name=${part.name}
style="background-image: url(${makeImageSourceSecure(part.value.thumbnail.url)})">
</figure>
<div class="media__title"> if (part.value && part.value.thumbnail.url) {
${part.value.title} renderedContentCollection.push(`
</div> <section class="playground-content__trend">
<figure
class="media__thumb"
data-action="choose claim"
data-claim-id="${part.claim_id}"
data-name=${part.name}
style="background-image: url(${makeImageSourceSecure(part.value.thumbnail.url)})">
</figure>
<div class="media__subtitle"> <div class="media__title">
${part.signing_channel.name || "Anon"} ${part.value.title || "Untitled"}
</div> </div>
</section>
`); <div class="media__subtitle">
${part.signing_channel ? part.signing_channel.name : "Anon"}
</div>
</section>
`);
}
}
} }
} renderedContentCollection.push(`
<script>
renderedContentCollection.push(` document.getElementById("playground-example-description").innerHTML = document.querySelector("[data-action='playground, example 3']").dataset.description
<script> </script>
document.getElementById("playground-example-description").innerHTML = document.querySelector("[data-action='playground, example 3']").dataset.description `);
</script> displayTrendingContent(renderedContentCollection.join(""));
`); })
.catch(error => {
displayTrendingContent(renderedContentCollection.join("")); console.error(error);
}); });
} }
} }
@@ -377,15 +366,6 @@ function getGitHubUserToken(socket) {
}); });
} }
async function getTrendingContent() {
try {
const response = await got("https://api.lbry.com/file/list_trending");
return JSON.parse(response.body); // eslint-disable-line padding-line-between-statements
} catch(error) {
return error;
}
}
function makeImageSourceSecure(url) { function makeImageSourceSecure(url) {
if (!url || !url.length) if (!url || !url.length)
return url; return url;
-7
View File
@@ -66,13 +66,6 @@ Configuration options are organized by their respective areas: Files, Wallet, Ne
| streaming_get | boolean | false | true | Allow calling localhost:5280/get/claimname requests | | streaming_get | boolean | false | true | Allow calling localhost:5280/get/claimname requests |
| save_files | boolean | true | false | Save files with each download | | save_files | boolean | true | false | Save files with each download |
| save_blobs | boolean | true | false | Save blobs with each download | | save_blobs | boolean | true | false | Save blobs with each download |
### Security
| Setting | Format | Default value | Sample Values | Description |
|----------------|---------|---------------|--------------------|----------------------------------------------------------------------------------------------------------------------------------|
| allowed_origin | string | '' | '*' or localhost | IP address to allow API requests from |
| use_auth_http | boolean | false | true | See [authentication instructions](https://github.com/lbryio/lbry-sdk/blob/master/lbrynet/daemon/auth/server.py#L179) for details |
### Other ### Other
| Setting | Format | Default value | Sample Values | Description | | Setting | Format | Default value | Sample Values | Description |
|--------------------|---------|---------------|--------------------------------|---------------------------------------------------------------------------------------------------------------| |--------------------|---------|---------------|--------------------------------|---------------------------------------------------------------------------------------------------------------|
+2 -1
View File
@@ -44,7 +44,8 @@
"redis": "^2.8.0", "redis": "^2.8.0",
"slack-node": "^0.1.8", "slack-node": "^0.1.8",
"socket.io": "^2.2.0", "socket.io": "^2.2.0",
"stringify-object": "^3.3.0" "stringify-object": "^3.3.0",
"request": "latest"
}, },
"description": "Documentation for the LBRY protocol and associated projects", "description": "Documentation for the LBRY protocol and associated projects",
"devDependencies": { "devDependencies": {