Skip to content

Commit

Permalink
Fix Standard.js Errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Kennybll committed May 1, 2018
1 parent bf0f7d9 commit 9137d88
Show file tree
Hide file tree
Showing 11 changed files with 163 additions and 139 deletions.
2 changes: 1 addition & 1 deletion app.js
Expand Up @@ -53,7 +53,7 @@ app.use(async function (req, res, next) {
if (req.session.steemconnect) {
res.logged = true
res.mod = await delegatorScript.getIfMod(req.session.steemconnect.name)
res.mod = res.mod >= 0 ? true : false
res.mod = res.mod >= 0
} else {
res.logged = false
res.mod = false
Expand Down
2 changes: 1 addition & 1 deletion db/index.js
Expand Up @@ -3,5 +3,5 @@ const config = require('../config')
mongoose.connect(config.mongodb)

module.exports = {
mod: require('./models/mod'), post: require('./models/post')
Mod: require('./models/mod'), Post: require('./models/post')
}
79 changes: 42 additions & 37 deletions modules/accinfo.js
@@ -1,3 +1,5 @@
/* eslint-disable camelcase */

let steem = require('steem')
let marked = require('marked')

Expand Down Expand Up @@ -27,7 +29,7 @@ let getAccountInfo = (username) => {
let lastVoteTime = (new Date() - new Date(user.last_vote_time + 'Z')) / 1000
let votePower = user.voting_power += (10000 * lastVoteTime / 432000)
votePower = Math.min(votePower / 100, 100).toFixed(2)

let data = {
name: user.name,
image: jsonData.profile_image ? 'https://steemitimages.com/512x512/' + jsonData.profile_image : '',
Expand All @@ -47,7 +49,7 @@ let getAccountInfo = (username) => {
createdDate: new Date(user.created)
}
data.usdValue = steem.formatter.estimateAccountValue(user)
steem.api.getFollowCount(user.name, function(err, result) {
steem.api.getFollowCount(user.name, function (err, result) {
if (err) console.log(err)
data.followerCount = result.follower_count
data.followingCount = result.following_count
Expand All @@ -57,7 +59,7 @@ let getAccountInfo = (username) => {
})
}

async function getImg(username) {
async function getImg (username) {
return new Promise((resolve, reject) => {
steem.api.getAccounts([username], (err, re) => {
if (err) console.log(err)
Expand All @@ -72,9 +74,9 @@ async function getImg(username) {
})
}

async function getComments(username, permlink) {
async function getComments (username, permlink) {
return new Promise((resolve, reject) => {
steem.api.getContentReplies(username, permlink, async function(err, resp) {
steem.api.getContentReplies(username, permlink, async function (err, resp) {
if (err) console.log(err)
resp.map(r => {
r.body = marked(r.body)
Expand All @@ -85,9 +87,9 @@ async function getComments(username, permlink) {
})
}

async function getPostAndComments(username, permlink) {
async function getPostAndComments (username, permlink) {
return new Promise((resolve, reject) => {
steem.api.getContent(username, permlink, function(err, resp) {
steem.api.getContent(username, permlink, function (err, resp) {
if (err) console.log(err)
console.log(resp)
let i = {
Expand All @@ -105,71 +107,72 @@ async function getPostAndComments(username, permlink) {
})
}

function parsePayoutAmount(amount) {
return parseFloat(String(amount).replace(/\s[A-Z]*$/, ''));
function parsePayoutAmount (amount) {
return parseFloat(String(amount).replace(/\s[A-Z]*$/, ''))
}

const calculatePayout = post => {
const payoutDetails = {};
const payoutDetails = {}
const {
active_votes,
parent_author,
cashout_time
} = post;
} = post

const max_payout = parsePayoutAmount(post.max_accepted_payout);
const pending_payout = parsePayoutAmount(post.pending_payout_value);
const promoted = parsePayoutAmount(post.promoted);
const total_author_payout = parsePayoutAmount(post.total_payout_value);
const total_curator_payout = parsePayoutAmount(post.curator_payout_value);
const is_comment = parent_author !== '';
const max_payout = parsePayoutAmount(post.max_accepted_payout)
const pending_payout = parsePayoutAmount(post.pending_payout_value)
const promoted = parsePayoutAmount(post.promoted)
const total_author_payout = parsePayoutAmount(post.total_payout_value)
const total_curator_payout = parsePayoutAmount(post.curator_payout_value)
const is_comment = parent_author !== ''

let payout = pending_payout + total_author_payout + total_curator_payout;
if (payout < 0.0) payout = 0.0;
if (payout > max_payout) payout = max_payout;
payoutDetails.payoutLimitHit = payout >= max_payout;
let payout = pending_payout + total_author_payout + total_curator_payout
if (payout < 0.0) payout = 0.0
if (payout > max_payout) payout = max_payout
payoutDetails.payoutLimitHit = payout >= max_payout

// There is an "active cashout" if: (a) there is a pending payout, OR (b)
// there is a valid cashout_time AND it's NOT a comment with 0 votes.
const cashout_active =
pending_payout > 0 ||
(cashout_time.indexOf('1969') !== 0 && !(is_comment && active_votes.length === 0));
(cashout_time.indexOf('1969') !== 0 && !(is_comment && active_votes.length === 0))

if (cashout_active) {
payoutDetails.potentialPayout = pending_payout;
payoutDetails.potentialPayout = pending_payout
}

if (promoted > 0) {
payoutDetails.promotionCost = promoted;
payoutDetails.promotionCost = promoted
}

if (cashout_active) {
payoutDetails.cashoutInTime = cashout_time;
payoutDetails.cashoutInTime = cashout_time
}

if (max_payout === 0) {
payoutDetails.isPayoutDeclined = true;
payoutDetails.isPayoutDeclined = true
} else if (max_payout < 1000000) {
payoutDetails.maxAcceptedPayout = max_payout;
payoutDetails.maxAcceptedPayout = max_payout
}

if (total_author_payout > 0) {
payoutDetails.pastPayouts = total_author_payout + total_curator_payout;
payoutDetails.authorPayouts = total_author_payout;
payoutDetails.curatorPayouts = total_curator_payout;
payoutDetails.pastPayouts = total_author_payout + total_curator_payout
payoutDetails.authorPayouts = total_author_payout
payoutDetails.curatorPayouts = total_curator_payout
}

return payoutDetails;
};
return payoutDetails
}

function payoutCalculator(author, permlink) {
function payoutCalculator (author, permlink) {
return new Promise((resolve, reject) => {
steem.api.getContent(author, permlink, function(err, result) {
steem.api.getContent(author, permlink, function (err, result) {
if (err) reject(err)
if (result) {
resolve(calculatePayout(result));
resolve(calculatePayout(result))
}
});
});
})
})
}

module.exports = {
Expand All @@ -179,3 +182,5 @@ module.exports = {
getComments,
payoutCalculator
}

/* eslint-disable camelcase */
6 changes: 3 additions & 3 deletions modules/delegators.js
Expand Up @@ -69,7 +69,7 @@ function add (object, name, value) {

async function getWeights (account, callback) {
await loadDelegations(account, async function (del) {
let mods = await db.mod.find({}).sort({votes: -1}).limit(3)
let mods = await db.Mod.find({}).sort({votes: -1}).limit(3)
mods = mods.map(mod => mod.steem)
var weights = {}
mods.forEach(mod => {
Expand Down Expand Up @@ -102,9 +102,9 @@ async function getWeights (account, callback) {
})
}

function getIfMod(account) {
function getIfMod (account) {
return new Promise(async (resolve, reject) => {
await loadDelegations('memeit.lol', function(del) {
await loadDelegations('memeit.lol', function (del) {
del = del.map(d => d.delegator)
resolve(del.indexOf(account))
})
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.css
Expand Up @@ -3,7 +3,7 @@
}

@font-face {
font-family: Impact;
font-family: 'Meme';
src: url(/impact.ttf);
}

Expand Down
10 changes: 7 additions & 3 deletions public/js/new.js
Expand Up @@ -14,10 +14,14 @@ function draw () {
}

function addText() {
var text = new fabric.Textbox('CLICK ON ME', {width: 200,breakWords: true, textAlign:'center',left: 0, top: 0, fontFamily: 'Impact', fontSize: 40, stroke: '#000000', strokeWidth: 3, fill: "#ffffff" });
var text = new fabric.Textbox('CLICK ON ME', {width: 200,breakWords: true, textAlign:'center',left: 0, top: 0, fontFamily: 'Meme', fontSize: 40, stroke: '#000000', strokeWidth: 3, fill: "#ffffff", strokeMiterLimit: 2, strokeLineCap: "round" });
c.add(text);
}

function getDraft() {
return JSON.stringify(c.toJSON())
}

function drawMeme (src) {
var image = new Image();
image.onload = function() {
Expand All @@ -29,7 +33,7 @@ function drawMeme (src) {
console.log(scale)
c.backgroundImage.scaleToWidth(500)
c.setDimensions({width: 500,height: 500 * scale})
var text = new fabric.Text('memeit.lol', { left: 7, top: 500 * scale - 25, fontFamily: 'Impact', fontSize: 20, stroke: '#000000', strokeWidth: .75, fill: "#ffffff" });
var text = new fabric.Text('memeit.lol', { left: 7, top: 500 * scale - 25, fontFamily: 'Meme', fontSize: 20, stroke: '#000000', strokeWidth: .75, fill: "#ffffff", strokeMiterLimit: 2, strokeLineCap: "round" });
c.add(text);
c.item(0).selectable = false;
}, {crossOrigin: 'anonymous'})
Expand All @@ -47,7 +51,6 @@ submit.addEventListener('click', function (e) {
form.submit()
})
})
draw()
c.on('object:selected', function(e) {
text.value = c.getActiveObject().text;
});
Expand All @@ -57,3 +60,4 @@ text.addEventListener('keyup', function (e) {
obj.text = e.target.value.toUpperCase();
c.renderAll();
});
draw()
75 changes: 40 additions & 35 deletions routes/feed.js
@@ -1,59 +1,64 @@
let express = require('express')
let util = require('../modules/util')
let router = express.Router()
let db = require('../db')

/* GET users listing. */
router.get('/:feed', async (req, res, next) => {
let posts
if (req.params.feed === 'all') {
posts = await db.post.find({}).sort({time: -1}).limit(10)
posts = await db.Post.find({}).sort({time: -1}).limit(10)
} else if (req.params.feed === 'approved') {
posts = await db.post.find({hidden: false}).sort({time: -1}).limit(10)
posts = await db.Post.find({hidden: false}).sort({time: -1}).limit(10)
} else {
posts = []
}
if (res.logged) res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: 1,
feed: req.params.feed,
username: req.session.steemconnect.name
})
else res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: 1,
feed: req.params.feed
})
if (res.logged) {
res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: 1,
feed: req.params.feed,
username: req.session.steemconnect.name
})
} else {
res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: 1,
feed: req.params.feed
})
}
})

router.get('/:feed/:num', async (req, res, next) => {
let posts
if (req.params.feed === 'all') {
posts = await db.post.find({}).sort({time: -1}).skip(req.params.num * 10).limit(10)
posts = await db.Post.find({}).sort({time: -1}).skip(req.params.num * 10).limit(10)
} else if (req.params.feed === 'approved') {
posts = await db.post.find({hidden: false}).sort({time: -1}).skip(req.params.num * 10).limit(10)
posts = await db.Post.find({hidden: false}).sort({time: -1}).skip(req.params.num * 10).limit(10)
} else {
posts = []
}
if (res.logged) res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: parseInt(req.params.num) + 1,
feed: req.params.feed,
username: req.session.steemconnect.name
})
else res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: parseInt(req.params.num) + 1,
feed: req.params.feed
})
if (res.logged) {
res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: parseInt(req.params.num) + 1,
feed: req.params.feed,
username: req.session.steemconnect.name
})
} else {
res.render('feed', {
posts,
logged: res.logged,
mod: res.mod,
num: parseInt(req.params.num) + 1,
feed: req.params.feed
})
}
})

module.exports = router

0 comments on commit 9137d88

Please sign in to comment.