Found a better way to parse threads from reddit

This commit is contained in:
Jesper Wrang 2018-01-15 12:02:04 +01:00
parent 9c3514253c
commit 4492064184
7 changed files with 114 additions and 85 deletions

View file

@ -6,9 +6,9 @@ export default props => (
<h2 className='about'>About</h2>
<p>
Display
<b className='removed' title='Removed by mods'>removed</b>
<b className='removed-text' title='Removed by mods'> removed </b>
(by mods) and
<b className='deleted' title='Deleted by users'>deleted</b>
<b className='deleted-text' title='Deleted by users'> deleted </b>
(by users) comments/threads from Reddit.
</p>
<p>

View file

@ -32,6 +32,7 @@ export const getThread = threadID => {
)
}
// getComments (handle more than 100, try 50, 25 etc....)
export const test = threadID => {
const elasticQuery = {
query: {

View file

@ -1,61 +1,80 @@
import { json } from 'utils'
import clientID from './clientID'
import { json, flatten } from 'utils'
import { fetchToken, redditAuth } from 'reddit/token'
// Reddit API
// Headers for general api calls
const init = {
headers: {
Authorization: '',
},
}
let hasToken = false
let baseCommentTree = {}
// Headers for getting reddit api token
const tokenInit = {
headers: {
Authorization: `Basic ${btoa(`${clientID}:`)}`,
'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
},
method: 'POST',
body: `grant_type=${encodeURIComponent('https://oauth.reddit.com/grants/installed_client')}&device_id=DO_NOT_TRACK_THIS_DEVICE`,
}
const fetchToken = () => {
if (hasToken) {
return Promise.resolve()
}
return (
fetch('https://www.reddit.com/api/v1/access_token', tokenInit)
.then(json)
.then(jsonData => {
init.headers.Authorization = `bearer ${jsonData.access_token}`;
hasToken = true
})
)
}
let cachedThread = {}
export const lookup = {}
export const getThread = (subreddit, threadID) => (
fetchToken()
.then(() => fetch(`https://oauth.reddit.com/r/${subreddit}/comments/${threadID}`, init))
.then(() => fetch(`https://oauth.reddit.com/r/${subreddit}/comments/${threadID}`, redditAuth))
.then(json)
.then(results => {
// Save the comments for later
baseCommentTree = results[1].data.children
cachedThread = results
// Return the thread
return results[0].data.children[0].data
})
)
export const getCommentIDs = () => {
const handleThreadComment = (comment, results) => {
if (comment.kind === 't1') {
// Has comment replies
if (comment.data.replies) {
// Handle all replies in the same way
comment.data.replies.data.children.forEach(reply => handleThreadComment(reply, results))
delete comment.data.replies
}
// Add to the return object
results.ids.push(comment.data.id)
// Store commment in lookup table
lookup[comment.data.id] = comment.data
} else if (comment.kind === 'more') {
if (comment.data.id === '_') {
// "continue this thread" comment
results.continueThisThreadIDs.push(comment.data.parent_id);
} else if (comment.data.children.length < comment.data.count) {
// "Load more"-comment (that is missing some of its children)
results.morechildrenIDs.push(comment.data.children)
}
// Always add the "more"-comments children
results.ids.push(...comment.data.children)
} else {
console.error('WTF', comment.kind)
}
return results
}
const handleMoreChildren = () => {
}
// HandleIDs.normal(thread);
const handleThread = thread => {
const comments = thread[1].data.children
// Ugly "hack", using this object as a pointer for storing comments.
// Not very js-like
const results = {
ids: [],
continueThisThreadIDs: [],
morechildrenIDs: [],
}
comments.map(comment => handleThreadComment(comment, results))
const { ids, continueThisThreadIDs, morechildrenIDs } = results
console.log(ids)
console.log(continueThisThreadIDs)
console.log(morechildrenIDs)
handleMoreChildren()
}
export const getCommentIDs = () => handleThread(cachedThread)
// return HandleIDs.morechildren()
// .catch(function(error){
// return Promise.reject("Could not get comments from Reddit (moreChildren)");
@ -261,40 +280,6 @@ export const getCommentIDs = () => {
// };
// })();
// // ------------------------------------------------------------------------------
// // ----------------------- Extract ID from comments -----------------------------
// // ------------------------------------------------------------------------------
// var Extract = (function(){
// var normal = function(comment){
// var data = comment.data;
// if(comment.kind == "more") { // "Show more"-comment
// if(data.id === "_") { // = "continue this thread" comment
// Comments.countinuethread.push(data.parent_id);
// } else if(data.children.length < data.count){ // "Load more"-comment (that is missing some of its children)
// Comments.morechildren.push(data.children);
// }
// Comments.ids.push.apply(Comments.ids, data.children);
// } else { // Normal comment
// if(data.replies) {
// data.replies.data.children.forEach(function(child){
// normal(child);
// });
// delete data.replies;
// }
// Comments.ids.push(data.id);
// Comments.lookup[data.id] = data;
// }
// };
// return {
// normal: normal
// };
// })();
// // ------------------------------------------------------------------------------
// // ---------------------------- Generating HTML ---------------------------------
// // ------------------------------------------------------------------------------

37
src/js/reddit/token.js Normal file
View file

@ -0,0 +1,37 @@
import { json } from 'utils'
import clientID from './clientID'
// Connecting to Reddit API
let hasToken = false
// Headers for general api calls
export const redditAuth = {
headers: {
Authorization: '',
},
}
// Headers for getting reddit api token
const tokenInit = {
headers: {
Authorization: `Basic ${btoa(`${clientID}:`)}`,
'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
},
method: 'POST',
body: `grant_type=${encodeURIComponent('https://oauth.reddit.com/grants/installed_client')}&device_id=DO_NOT_TRACK_THIS_DEVICE`,
}
export const fetchToken = () => {
if (hasToken) {
return Promise.resolve()
}
return (
fetch('https://www.reddit.com/api/v1/access_token', tokenInit)
.then(json)
.then(jsonData => {
redditAuth.headers.Authorization = `bearer ${jsonData.access_token}`;
hasToken = true
})
)
}

View file

@ -2,6 +2,12 @@ import SnuOwnd from 'libraries/snuownd.js'
const markdown = SnuOwnd.getParser()
// Flatten arrays one level
export const flatten = arr => arr.reduce(
(accumulator, value) => accumulator.concat(value),
[]
)
// Change bases
export const toBase36 = number => parseInt(number, 10).toString(36)
export const toBase10 = numberString => parseInt(numberString, 36)
@ -18,7 +24,7 @@ export const json = x => x.json()
// Parse comments
export const parse = text => markdown.render(text)
// UTC -> "Reddit time format" (e.g. 5 hours ago, just now, etc...)
// UTC to "Reddit time format" (e.g. 5 hours ago, just now, etc...)
export const prettyDate = createdUTC => {
const currentUTC = Math.floor((new Date()).getTime() / 1000)
const secondDiff = currentUTC - createdUTC

View file

@ -7,12 +7,6 @@
max-width: 800px
background-color: #161616
.removed
color: $red
.deleted
color: $blue
h2
margin: 20px 0px 12px

View file

@ -21,6 +21,12 @@ html, body
.deleted
background-color: $deleted
.removed-text
color: $red
.deleted-text
color: $blue
a
color: $link