prehistoric-systems/removeddit
1
0
Fork 0
mirror of https://github.com/gurnec/removeddit.git synced 2026-03-11 08:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rewrote majority of the thread part

Browse source
This commit is contained in:
Jesper Wrang 2017-11-16 18:41:32 +01:00
parent 987c100037
commit b74af1db3f
21 changed files with 373 additions and 519 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
compile.sh
View file

@ -1,7 +1,12 @@
### Use these for production
pug -P -o . pug/about.pug pug/thread.pug pug/subreddit.pug pug/search.pug
sass --sourcemap=none --style expanded sass/main.sass static/css/style.css
lodash include=defaultTo,toLower,includes,parseInt,has,isNil,uniq,property,map,forEach,join,sortBy,get,now,template -p -o static/js/libraries/lodash.custom.min.js
lodash template="jst/*.jst" -p -o static/js/libraries/lodash.templates.min.js
### Use these in development
#pug --watch -P -o . pug/about.pug pug/thread.pug pug/subreddit.pug pug/search.pug
#sass --watch --sourcemap=none --style expanded sass/main.sass:static/css/style.css
#sass --watch --sourcemap=none --style expanded sass/main.sass:static/css/style.css
#lodash template="jst/*.jst" -d -o static/js/libraries/lodash.templates.min.js

25
jst/comment.jst Normal file
View file

@ -0,0 +1,25 @@
<%
var isRemoved = _.has(comment,"removed");
var isDeleted = _.has(comment,"deleted");
var commentCss = "comment comment-" + (isRemoved ? "removed" : (isDeleted ? "deleted" : (comment.depth % 2 == 0 ? "even" : "odd")));
%>
<div id="<%= id %>" class="<%= commentCss %>">
<div class="comment-head">
<a href="javascript:void(0)" class="author">[–]</a>
<a href="https://www.reddit.com/user/<%= comment.author %>" class="author comment-author">
<%= comment.author+(isDeleted ? " (deleted by user)" : "") %>
</a>
<span class="comment-score"><%= Format.prettyScore(comment.score) %> point<%= ((comment.score == 1) ? "": "s") %></span>
<span class="comment-time"><%= Format.prettyDate(comment.created_utc) %></span>
</div>
<div class="comment-body">
<%= (comment.body === "[removed]" && isRemoved ? "<p>[likely removed by automoderator]</p>" : Format.parse(comment.body)) %>
</div>
<div class="comment-links">
<a href="/r/<%= Reddit.subreddit %>/comments/<%= Reddit.threadID %>/_/<%= id %>/">permalink</a>
<a href="https://www.reddit.com/r/<%= Reddit.subreddit %>/comments/<%= Reddit.threadID %>/_/<%= id %>/">reddit</a>
</div>
</div>

10
jst/elasticCommentIDs.jst Normal file
View file

@ -0,0 +1,10 @@
{
"query":{
"ids":{
"values":[<%= ids.join() %>]
}
},
"_source":[
"author","body","created_utc","parent_id","score"
]
}

11
jst/elasticComments.jst Normal file
View file

@ -0,0 +1,11 @@
{
"query":{
"term":{
"link_id":<%= id %>
}
},
"_source":[
"author","body","created_utc","parent_id","score"
],
"size":50
}

30
jst/elasticSubreddit.jst Normal file
View file

@ -0,0 +1,30 @@
{
"query":{
"bool":{
"must":[
<% if(_.toLower(subreddit) !== "all") { %>
{
"term":{
"subreddit":"<%= _.toLower(subreddit) %>"
}
},
<% } %>
{
"range":{
"created_utc":{
"gt":<%= time %>
}
}
}
]
}
},
"_source":[
"author","url","subreddit","link_flair_text","score","title","created_utc","num_comments","domain","permalink","id","thumbnail","thumbnail_height","thumbnail_width"
],
"sort":[
{"score":"desc"}
],
"from":<%= (page-1)*postPerPage %>,
"size":<%= postPerPage %>
}

11
jst/elasticThread.jst Normal file
View file

@ -0,0 +1,11 @@
{
"query":{
"term":{
"id":"<%= id %>"
}
},
"_source":[
"author","created_utc","domain","link_flair_text","num_comments","url","subreddit","score","title","selftext","permalink","thumbnail","thumbnail_height","thumbnail_width"
],
"size":1
}

5
jst/thread.jst
View file

@ -1,5 +1,7 @@
<div class="thread">
<% if(typeof postNr !== "undefined") { %>
<span class="post-rank"><%= postNr %></span>
<% } %>
<div class="thread-score-box">
<div class="vote upvote"></div>
<div class="thread-score"><%= Format.prettyScore(thread.score) %></div>
@ -17,10 +19,11 @@
</a>
<% } %>
<div class="thread-content">
<a class="thread-title" href="<%= url %>"><%= thread.title %></a>
<% if(!_.isNil(thread.link_flair_text)){ %>
<span class="link-flair"><%= thread.link_flair_text %></span>
<% } %>
<a class="thread-title" href="<%= url %>"><%= thread.title %></a>
<span class="domain">(<%= thread.domain %>)</span>
<div class="thread-info">
submitted <span class="thread-time"><%= Format.prettyDate(thread.created_utc) %></span> by

4
jst/threadInfo.jst Normal file
View file

@ -0,0 +1,4 @@
<div id="comment-info">
removed comments: <%= removedComments %>/<%= totalComments %> (<%= (100 * removedComments / totalComments).toFixed(1) %>%)
</div>
<div id="comment-sort">sorted by: top</div>

1
pug/base.pug
View file

@ -35,5 +35,4 @@ html
script(src='/static/js/libraries/lodash.templates.min.js')
script(src='/static/js/polyfills/promise.min.js')
script(src='/static/js/polyfills/fetch.js')
script(src='/static/js/id.js')
script(src='/static/js/functions.js')

140
sass/post.sass
View file

@ -1,131 +1,13 @@
.thread
display: flex
flex-grow: 1
margin-bottom: 7px
.thumbnail
width: 70px
margin-right: 3px
img
border-radius: 1px
.thumbnail-default
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1099px
background-repeat: no-repeat
height: 50px
.thumbnail-self
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1267px
background-repeat: no-repeat
height: 50px
.thumbnail-image
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1043px
background-repeat: no-repeat
height: 50px
.thumbnail-nsfw
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1155px
background-repeat: no-repeat
height: 50px
.thread-score-box
margin: 0 7px
width: 43px
.vote
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAcCAMAAADC4sagAAABFFBMVEUjJCQiIiIjIyMkIiIkJCQlJSUlJicmJiYnIyEnJycnKCsoKCgpLC8rIyErKyssMDUvLy8wJCAwMDAxMTEyMjI0NDQ2NjY3JR83Nzc5OTk7Ozs8PDw9PT0+Pj4/Pz9AQEBBQUFCQkJDQ0NGRkZISEhKSkpKV2tLS0tMTExOTk5PT09QYHdSUlJTU1NVVVVWVlZXV1dXaINYWFhaWlpabYlbW1tecpBgYGBhYWFid5dkZGRle5xlfJ1pgKRrhKhshKlshapuLhZwirFyjbV0j7h4lL97mcZ9MBR/nsyCo9OOMxGcNQ+eNg+kNw6sOA2vOAy0OQy7Ogq/OwrBOwrDPAnLPQjPPQfTPgfbPwXjQQTrQgPzQwLKxGgxAAAAAXRSTlMAQObYZgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlJREFUOMu9lF1TwjAQRTcMvmeQOi1QPmxFBQTxW1ERUUFEUVRU/P//w9yGmBTFyZPnpXNmbju76W6IJM8Uw49rLa6Tz4mpq/mCqY3Gvqnj6XQ61lp0mGd8favCwx2tow8wUlpwGWOZrNJKjXO+UVc6fJcMZzV7IswSOU/qej0l0rwyq33wphhAM1kWkcy70GB7mUfUNqG9V02PyPMTMs2Wig5RaTctwzxVXyPqvJh0VkJBIKJ4huncCRAvHOEZyGKegO4a6UDrIdLGCT4C6/QDsE7fA+v0HdAadWqk0SH9D3sgXkm4uJIDYKTFnwwXd3kMrNOnwDp9BmzS5QuTshN1iDRwfkxV9VJTJXLzSWYM+NzEEjWvFE2oGvCE7/2yDeL8riWzM8xmorRazLlNI2rdgNb3ZYLF1Es/t8VE7X6/39Yqlt4tLLwhiLq3XVNLfumP24fo3Opm+wLGCVa252Y8tQAAAABJRU5ErkJggg==)
background-repeat: no-repeat
margin-left: auto
margin-right: auto
width: 15px
height: 14px
cursor: pointer
.upvote
background-position: -15px 0px
margin-top: 2px
.downvote
background-position: -15px -14px
margin-top: 2px
.thread-score
color: #646464
font-size: 13px
font-weight: bold
text-align: center
.thread-content
flex: 1
float: left
margin-left: 3px
.link-flair
color: #c8c8c8
background-color: #404040
margin-right: 5px
border: 1px solid #4d4d4d
border-radius: 2px
padding: 0 2px
font-size: 10px
.thread-title
color: #a6a6a6
margin-right: 5px
.thread-title:hover
text-decoration: none
.domain
color: #888
font-size: 10px
.thread-selftext
border: 1px solid #666
border-radius: 7px
margin: 5px 0 7px
padding: 5px 10px
max-width: 840px
color: #ddd
font-size: 14px
p
margin: 5px 0
line-height: 20px
a:hover
text-decoration: none
p:first-child
margin-top: 0px
#comment-info
color: #ca302c
margin-top: 10px
font-weight: bold
padding-bottom: 5px
border-bottom: 1px dotted #808080
font-size: 16px
p:last-child
margin-bottom: 0px
.thread-image
max-width: 768px
max-height: 768px
.thread-info
color: #828282
font-size: 10px
margin-top: 2px
.total-comments
color: #828282
font-size: 10px
margin: 4px 0
.grey-link, .grey-link:link, .grey-link:visited, .grey-link:hover, .grey-link:focus, .grey-link:active
color: #828282
margin-right: 4px
#comment-sort
color: #808080
font-size: 12px
margin: 5px 0 10px

141
sass/thread.sass
View file

@ -1,13 +1,132 @@
#comment-info
color: #ca302c
margin-top: 10px
font-weight: bold
padding-bottom: 5px
border-bottom: 1px dotted #808080
font-size: 16px
.thread
display: flex
flex-grow: 1
margin-bottom: 7px
.thumbnail
width: 70px
margin-right: 3px
img
border-radius: 1px
.thumbnail-default
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1099px
background-repeat: no-repeat
height: 50px
.thumbnail-self
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1267px
background-repeat: no-repeat
height: 50px
.thumbnail-image
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1043px
background-repeat: no-repeat
height: 50px
.thumbnail-nsfw
background-image: url("https://www.redditstatic.com/sprite-reddit.6Om8v6KMv28.png")
background-position: 0px -1155px
background-repeat: no-repeat
height: 50px
.thread-score-box
margin: 0 7px
width: 43px
.vote
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAcCAMAAADC4sagAAABFFBMVEUjJCQiIiIjIyMkIiIkJCQlJSUlJicmJiYnIyEnJycnKCsoKCgpLC8rIyErKyssMDUvLy8wJCAwMDAxMTEyMjI0NDQ2NjY3JR83Nzc5OTk7Ozs8PDw9PT0+Pj4/Pz9AQEBBQUFCQkJDQ0NGRkZISEhKSkpKV2tLS0tMTExOTk5PT09QYHdSUlJTU1NVVVVWVlZXV1dXaINYWFhaWlpabYlbW1tecpBgYGBhYWFid5dkZGRle5xlfJ1pgKRrhKhshKlshapuLhZwirFyjbV0j7h4lL97mcZ9MBR/nsyCo9OOMxGcNQ+eNg+kNw6sOA2vOAy0OQy7Ogq/OwrBOwrDPAnLPQjPPQfTPgfbPwXjQQTrQgPzQwLKxGgxAAAAAXRSTlMAQObYZgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlJREFUOMu9lF1TwjAQRTcMvmeQOi1QPmxFBQTxW1ERUUFEUVRU/P//w9yGmBTFyZPnpXNmbju76W6IJM8Uw49rLa6Tz4mpq/mCqY3Gvqnj6XQ61lp0mGd8favCwx2tow8wUlpwGWOZrNJKjXO+UVc6fJcMZzV7IswSOU/qej0l0rwyq33wphhAM1kWkcy70GB7mUfUNqG9V02PyPMTMs2Wig5RaTctwzxVXyPqvJh0VkJBIKJ4huncCRAvHOEZyGKegO4a6UDrIdLGCT4C6/QDsE7fA+v0HdAadWqk0SH9D3sgXkm4uJIDYKTFnwwXd3kMrNOnwDp9BmzS5QuTshN1iDRwfkxV9VJTJXLzSWYM+NzEEjWvFE2oGvCE7/2yDeL8riWzM8xmorRazLlNI2rdgNb3ZYLF1Es/t8VE7X6/39Yqlt4tLLwhiLq3XVNLfumP24fo3Opm+wLGCVa252Y8tQAAAABJRU5ErkJggg==)
background-repeat: no-repeat
margin-left: auto
margin-right: auto
width: 15px
height: 14px
cursor: pointer
.upvote
background-position: -15px 0px
margin-top: 2px
.downvote
background-position: -15px -14px
margin-top: 2px
.thread-score
color: #646464
font-size: 13px
font-weight: bold
text-align: center
.thread-content
flex: 1
float: left
margin-left: 3px
.link-flair
display: inline-block
color: #c8c8c8
background-color: #404040
margin-right: 5px
border: 1px solid #4d4d4d
border-radius: 2px
padding: 0 2px
font-size: 10px
.thread-title
color: #a6a6a6
margin-right: 5px
.thread-title:hover
text-decoration: none
.domain
color: #888
font-size: 10px
.thread-selftext
border: 1px solid #666
border-radius: 7px
margin: 5px 0 7px
padding: 5px 10px
max-width: 840px
color: #ddd
font-size: 14px
p
margin: 5px 0
line-height: 20px
a:hover
text-decoration: none
p:first-child
margin-top: 0px
#comment-sort
color: #808080
font-size: 12px
margin: 5px 0 10px
p:last-child
margin-bottom: 0px
.thread-image
max-width: 768px
max-height: 768px
.thread-info
color: #828282
font-size: 10px
margin-top: 2px
.total-comments
color: #828282
font-size: 10px
margin: 4px 0
.grey-link, .grey-link:link, .grey-link:visited, .grey-link:hover, .grey-link:focus, .grey-link:active
color: #828282
margin-right: 4px

1
search.html
View file

@ -23,7 +23,6 @@
<script src="/static/js/libraries/lodash.templates.min.js"></script>
<script src="/static/js/polyfills/promise.min.js"></script>
<script src="/static/js/polyfills/fetch.js"></script>
<script src="/static/js/id.js"></script>
<script src="/static/js/functions.js"></script>
<script src="/static/js/libraries/js.cookie.js"></script>
<script src="/static/js/search.js"></script>

31
static/css/style.css
View file

@ -165,6 +165,21 @@ header #status #status-image {
background-color: #161616;
}
#comment-info {
color: #ca302c;
margin-top: 10px;
font-weight: bold;
padding-bottom: 5px;
border-bottom: 1px dotted #808080;
font-size: 16px;
}
#comment-sort {
color: #808080;
font-size: 12px;
margin: 5px 0 10px;
}
.thread {
display: flex;
flex-grow: 1;
@ -234,6 +249,7 @@ header #status #status-image {
margin-left: 3px;
}
.thread .link-flair {
display: inline-block;
color: #c8c8c8;
background-color: #404040;
margin-right: 5px;
@ -294,21 +310,6 @@ header #status #status-image {
margin-right: 4px;
}
#comment-info {
color: #ca302c;
margin-top: 10px;
font-weight: bold;
padding-bottom: 5px;
border-bottom: 1px dotted #808080;
font-size: 16px;
}
#comment-sort {
color: #808080;
font-size: 12px;
margin: 5px 0 10px;
}
.post-rank {
min-width: 20px;
color: #505050;

13
static/js/functions.js
View file

@ -89,14 +89,13 @@ var Fetch2 = (function(){
var ElasticSearch = (function() {
var elastic = "https://elastic.pushshift.io";
//var elasticThreads: elastic+"/rs/submissions/_search?source="
return {
subreddit: function(){},
thread: function(){},
comment: function(){}
};
return {
thread: function(){},
comment: function(){},
threadURL: elastic+"/rs/submissions/_search?source=",
commentURL: elastic+"/rc//comments/_search?source="
};
})();
// HTML parsing

8
static/js/id.js
View file

@ -1,8 +0,0 @@
// Change this to your own client ID: https://www.reddit.com/prefs/apps
// Guide about it here: https://github.com/JubbeArt/removeddit#the-i-just-want-to-get-this-shit-running-guide
// NOTE: The app NEEDS TO BE an installed app and NOT a web apps
var clientID = "";
if(clientID === "") {
alert("Missing client-ID for Reddit API. See the file \"static/js/id.js\"");
}

17
static/js/libraries/lodash.templates.min.js vendored
View file

@ -3,10 +3,15 @@
* Lodash (Custom Build) lodash.com/license | Underscore.js underscorejs.org/LICENSE
* Build: `lodash template="jst/*.jst" -p -o static/js/libraries/lodash.templates.min.js`
*/
;(function(){var e=typeof self=="object"&&self&&self.Object===Object&&self,e=typeof global=="object"&&global&&global.Object===Object&&global||e||Function("return this")(),f=typeof exports=="object"&&exports&&!exports.nodeType&&exports,g=f&&typeof module=="object"&&module&&!module.nodeType&&module,c=e._||{},d={subredditInfo:function(a){a||(a={});var b;with(a)a=""+('<div class="subreddit-info">\n\ttop post of <a href="https://www.reddit.com/r/'+(null==(b=subreddit)?"":b)+'">/r/'+(null==(b=subreddit)?"":b)+'</a> from:\n\t<select onchange="Vars.reload(this)">\n\t\t<option value="hour"'),
"hour"===time&&(a+=" selected"),a+='>past hour</option>\n\t\t<option value="12hour"',"12hour"===time&&(a+=" selected"),a+='>past 12 hours</option>\n\t\t<option value="day"',"day"===time&&(a+=" selected"),a+='>past day</option>\n\t\t<option value="week"',"week"===time&&(a+=" selected"),a+='>past week</option>\n\t\t<option value="month"',"month"===time&&(a+=" selected"),a+='>past month</option>\n\t\t<option value="6month"',"6month"===time&&(a+=" selected"),a+='>past 6 months</option>\n\t\t<option value="year"',
"year"===time&&(a+=" selected"),a+='>past year</option>\n\t\t<option value="all"',"all"===time&&(a+=" selected");return a+">all time</option>\t\t\n\t</select>\t\t\t\t\n</div>"},subredditPagination:function(a){a||(a={});var b;with(a){a='<div id="pagination">\n\tPage: \n\t',1<start&&(a+='\n\t\t<a href="'+(null==(b=urlBase+1)?"":b)+'">1</a> ... \n\t');for(var c=start;c<=end;c++)a=currentPage===c?a+("\n\t\t\t<span>"+(null==(b=c)?"":b)+"</span>\n\t"):a+('\n\t\t\t<a href="'+(null==(b=urlBase+c)?"":b)+'">'+(null==(b=c)?"":b)+"</a>\n\t");
}return a+"\n</div>"},thread:function(a){a||(a={});var b;with(a){a=""+('<div class="thread">\n\t<span class="post-rank">'+(null==(b=postNr)?"":b)+'</span>\n\t<div class="thread-score-box">\n\t\t<div class="vote upvote"></div>\n\t\t<div class="thread-score">'+(null==(b=Format.prettyScore(thread.score))?"":b)+'</div>\n\t\t<div class="vote downvote"></div>\n\t</div>\n');var d=c.replace(thread.url,"https://www.reddit.com","https://www.removeddit.com");if(c.includes(["self","default","image","nsfw"],thread.thumbnail))a+='\n\t\t<a href="'+(null==(b=d)?"":b)+'" class="thumbnail thumbnail-'+(null==(b=thread.thumbnail)?"":b)+'"></a>\n';else{
var e=.5*c.defaultTo(thread.thumbnail_width,140),f=.5*c.defaultTo(thread.thumbnail_height,140);a+='\t<a href="'+(null==(b=d)?"":b)+'">\n\t\t\t<img class="thumbnail" src="'+(null==(b=thread.thumbnail)?"":b)+'" width="'+(null==(b=e)?"":b)+'" height="'+(null==(b=f)?"":b)+'">\n\t\t</a>\n'}a+='\n\t<div class="thread-content">\n',c.isNil(thread.link_flair_text)||(a+='\n\t\t<span class="link-flair">'+(null==(b=thread.link_flair_text)?"":b)+"</span>\n"),a+='\t\n\t\t<a class="thread-title" href="'+(null==(b=d)?"":b)+'">'+(null==(b=thread.title)?"":b)+'</a>\n\t\t<span class="domain">('+(null==(b=thread.domain)?"":b)+')</span>\n\t\t<div class="thread-info">\n\t\t\tsubmitted <span class="thread-time">'+(null==(b=Format.prettyDate(thread.created_utc))?"":b)+'</span> by\n\t\t\t<a class="thread-author author" href="https://www.reddit.com/user/'+(null==(b=thread.author)?"":b)+'">'+(null==(b=thread.author)?"":b)+"</a>\n\t\t",
;(function(){var e=typeof self=="object"&&self&&self.Object===Object&&self,e=typeof global=="object"&&global&&global.Object===Object&&global||e||Function("return this")(),f=typeof exports=="object"&&exports&&!exports.nodeType&&exports,h=f&&typeof module=="object"&&module&&!module.nodeType&&module,c=e._||{},d={comment:function(a){a||(a={});var b,g="";with(a){a=c.has(comment,"removed");var d=c.has(comment,"deleted"),e="comment comment-"+(a?"removed":d?"deleted":0==comment.depth%2?"even":"odd"),g=g+('\n\n<div id="'+(null==(b=id)?"":b)+'" class="'+(null==(b=e)?"":b)+'">\n\t<div class="comment-head">\n\t\t<a href="javascript:void(0)" class="author">[–]</a>\n\t\t<a href="https://www.reddit.com/user/'+(null==(b=comment.author)?"":b)+'" class="author comment-author">\n\t\t\t'+(null==(b=comment.author+(d?" (deleted by user)":""))?"":b)+'\n\t\t</a>\n\t\t<span class="comment-score">'+(null==(b=Format.prettyScore(comment.score))?"":b)+" point"+(null==(b=1==comment.score?"":"s")?"":b)+'</span>\n\t\t<span class="comment-time">'+(null==(b=Format.prettyDate(comment.created_utc))?"":b)+'</span>\n\t</div>\n\t<div class="comment-body">\n\t\t'+(null==(b="[removed]"===comment.body&&a?"<p>[likely removed by automoderator]</p>":Format.parse(comment.body))?"":b)+'\n\t</div>\n\t<div class="comment-links">\n\t\t<a href="/r/'+(null==(b=Reddit.subreddit)?"":b)+"/comments/"+(null==(b=Reddit.threadID)?"":b)+"/_/"+(null==(b=id)?"":b)+'/">permalink</a>\n\t\t<a href="https://www.reddit.com/r/'+(null==(b=Reddit.subreddit)?"":b)+"/comments/"+(null==(b=Reddit.threadID)?"":b)+"/_/"+(null==(b=id)?"":b)+'/">reddit</a>\n\t</div>\n</div>\n\n');
}return g},elasticCommentIDs:function(a){a||(a={});var b;with(a)a=""+('{\n\t"query":{\n\t\t"ids":{\n\t\t\t"values":['+(null==(b=ids.join())?"":b)+']\n\t\t}\n\t},\n\t"_source":[\n\t\t"author","body","created_utc","parent_id","score"\n\t]\n}');return a},elasticComments:function(a){a||(a={});var b;with(a)a=""+('{\n\t"query":{\n\t\t"term":{\n\t\t\t"link_id":'+(null==(b=id)?"":b)+'\n\t\t}\n\t},\n\t"_source":[\n\t\t"author","body","created_utc","parent_id","score"\n\t],\n\t"size":50\n}');return a},elasticSubreddit:function(a){
a||(a={});var b;with(a)a='{\n\t"query":{\n\t\t"bool":{\n\t\t\t"must":[\n\t\t\t\t',"all"!==c.toLower(subreddit)&&(a+='\n\t\t\t\t{\n\t\t\t\t\t"term":{\n\t\t\t\t\t\t"subreddit":"'+(null==(b=c.toLower(subreddit))?"":b)+'"\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t\t'),a+='\n\t\t\t\t{\n\t\t\t\t\t"range":{\n\t\t\t\t\t\t"created_utc":{\n\t\t\t\t\t\t\t"gt":'+(null==(b=time)?"":b)+'\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t]\n\t\t}\n\t},\n\t"_source":[\n\t\t"author","url","subreddit","link_flair_text","score","title","created_utc","num_comments","domain","permalink","id","thumbnail","thumbnail_height","thumbnail_width"\n\t],\n\t"sort":[\n\t\t{"score":"desc"}\n\t],\n\t"from":'+(null==(b=(page-1)*postPerPage)?"":b)+',\n\t"size":'+(null==(b=postPerPage)?"":b)+"\n}";
return a},elasticThread:function(a){a||(a={});var b;with(a)a=""+('{\n\t"query":{\n\t\t"term":{\n\t\t\t"id":"'+(null==(b=id)?"":b)+'"\n\t\t}\n\t},\n\t"_source":[\n\t\t"author","created_utc","domain","link_flair_text","num_comments","url","subreddit","score","title","selftext","permalink","thumbnail","thumbnail_height","thumbnail_width"\n\t],\n\t"size":1\n}');return a},search:function(a){with(a||(a={}),a);return'\n\tvar radioInput = function(name, displayNames, values) {\n\t\tvar inputs = "";\n\t\t\n\t\tfor(var i = 0, len = displayNames.length; i < len; i++){\n\t\t\tinputs += \'<span class="radioButton"\'+ (Vars.lookup[name] === values[i] ? \' style="background: #239f2b; color:#fff"\':\'\')+\'>\';\n\t\t\tinputs += \'<input type="radio" id="\'+name+i+\'" name="\'+name+\'" onchange="CSS.radio(this)"\';\n\t\t\tinputs += \'value="\'+values[i]+\'" \'+(Vars.lookup[name] === values[i] ? \' checked "\':\'\')+\' >\';\n\t\t\tinputs += \'<label for="\'+name+i+\'">\'+displayNames[i]+\'</label></span>\';\n\t\t}\n\t\treturn inputs;\n\t};\n\n\tvar textInput = function(name){\n\t\treturn \'<input type="text" name="\'+name+\'" id="\'+name+\'" value="\'+Vars.get(name)+\'">\'; \n\t};\n\n\tvar label = function(name, display) {\n\t\treturn \'<label for="\'+name+\'">\'+display+\': </label>\';\n\t};\n\n\tvar inputRow = function(text, input) {\n\t\treturn \'<div class="search-row"><span class="search-left">\'+text+\'</span><span>\'+input+"</span></div>";\n\t};\n\n\tvar selectTime = function() {\n\t\tvar values = ["hour", "12hour", "day", "week", "month", "6month", "year", "all"];\n\t\tvar display = ["past hour", "past 12 hours", "past day", "past week", "past month", "past 6 months", "past year", "all time"];\n\t\tvar html = \'<select name="time" id="time">\';\n\n\t\tfor(var i = 0, len = values.length; i < len; i++) {\n\t\t\thtml += \'<option value="\'+values[i]+\'"\' + ((Vars.get("time") === values[i]) ? " selected" : \'\')+\'>\'+display[i]+\'</option>\';\n\t\t}\n\n\t\treturn html + "</select>";\n\t};\n\n\tvar select = function(name, display, values){\n\t\tvar html = \'<select name="\'+name+\'" id="\'+name+\'">\';\n\t\t\n\t\tfor(var i = 0, len = values.length; i < len; i++) {\n\t\t\thtml += \'<option value="\'+values[i]+\'"\' + ((Vars.get(name) === values[i]) ? " selected" : \'\')+\'>\'+display[i]+\'</option>\';\n\t\t}\n\n\t\treturn html + "</select>";\n\t};\n\nreturn {\n\tcreateSearch: function(){\n\t\tvar searchBox = document.createElement("div");\n\t\tsearchBox.id = "main-box";\n\t\tsearchBox.className = "search-box";\n\t/*\n\t\tComments:\n\t\ttext\t\t\t(body)\t\tstring\n\t\ttitle \t\t(title)\t\tstring\n\t\tsubreddit\t\t(subreddit)\tstring\n\t\tauthor\t\t(author)\t\tstring\n\t\tover_18\t\t(over_18)\t\tsfw,nsfw,both *\n\t\tlocked\t\t(locked)\t\tbool *\n\t\tbetween\t\t(after/before)\t"date"\n\t\tsort \t\t(sort)\t\tasc,desc\n\t*/\n\t\tvar html = inputRow(\'Im looking for: \', radioInput("thread", ["Thread","Comment"], ["true", "false"]));\t\t\n\t\thtml += inputRow(label("text", "Text"), textInput("text"));\n\t\thtml += inputRow(label("title","Title"), textInput("title"));\n\t\thtml += inputRow(label("subreddit", "Subreddit"), textInput("subreddit"));\n\t\thtml += inputRow(label("author", "Author"), textInput("author"));\n\t\thtml += inputRow("Over 18: ", radioInput("over_18", ["Both","NSFW","SFW"], ["both","nsfw","sfw"]));\n\t\thtml += inputRow("Locked: ", radioInput("locked", ["Both","True", "False"], ["both","true","false"]));\n\t\thtml += inputRow("Removed: ", select("removed", ["Removed and non-removed", "Only removed", "Only deleted"], ["all", "removed", "deleted"]));\n\t\thtml += inputRow("From:", selectTime());\n\t\thtml += inputRow("Sort: ", select("sort", ["Highest score","Lowest score","Newest","Oldest"], ["score_desc","score_asc","time_desc","time_asc"]));\n\t\thtml += \'<input type="button" value="\'+(showAdvanced?\'Hide\':\'Show\')+\' advanced">\';\n\t\thtml += \'<input type="submit" value="Search">\';\n\t\tsearchBox.innerHTML = html;\n\t\n\t\tmainDiv.appendChild(searchBox);';
},subredditInfo:function(a){a||(a={});var b;with(a)a=""+('<div class="subreddit-info">\n\ttop post of <a href="https://www.reddit.com/r/'+(null==(b=subreddit)?"":b)+'">/r/'+(null==(b=subreddit)?"":b)+'</a> from:\n\t<select onchange="Vars.reload(this)">\n\t\t<option value="hour"'),"hour"===time&&(a+=" selected"),a+='>past hour</option>\n\t\t<option value="12hour"',"12hour"===time&&(a+=" selected"),a+='>past 12 hours</option>\n\t\t<option value="day"',"day"===time&&(a+=" selected"),a+='>past day</option>\n\t\t<option value="week"',
"week"===time&&(a+=" selected"),a+='>past week</option>\n\t\t<option value="month"',"month"===time&&(a+=" selected"),a+='>past month</option>\n\t\t<option value="6month"',"6month"===time&&(a+=" selected"),a+='>past 6 months</option>\n\t\t<option value="year"',"year"===time&&(a+=" selected"),a+='>past year</option>\n\t\t<option value="all"',"all"===time&&(a+=" selected");return a+">all time</option>\t\t\n\t</select>\t\t\t\t\n</div>"},subredditPagination:function(a){a||(a={});var b;with(a){a='<div id="pagination">\n\tPage: \n\t',
1<start&&(a+='\n\t\t<a href="'+(null==(b=urlBase+1)?"":b)+'">1</a> ... \n\t');for(var c=start;c<=end;c++)a=currentPage===c?a+("\n\t\t\t<span>"+(null==(b=c)?"":b)+"</span>\n\t"):a+('\n\t\t\t<a href="'+(null==(b=urlBase+c)?"":b)+'">'+(null==(b=c)?"":b)+"</a>\n\t")}return a+"\n</div>"},thread:function(a){a||(a={});var b;with(a){a='<div class="thread">\n',typeof postNr!="undefined"&&(a+='\n\t<span class="post-rank">'+(null==(b=postNr)?"":b)+"</span>\n"),a+='\n\t<div class="thread-score-box">\n\t\t<div class="vote upvote"></div>\n\t\t<div class="thread-score">'+(null==(b=Format.prettyScore(thread.score))?"":b)+'</div>\n\t\t<div class="vote downvote"></div>\n\t</div>\n';
var d=c.replace(thread.url,"https://www.reddit.com","https://www.removeddit.com");if(c.includes(["self","default","image","nsfw"],thread.thumbnail))a+='\n\t\t<a href="'+(null==(b=d)?"":b)+'" class="thumbnail thumbnail-'+(null==(b=thread.thumbnail)?"":b)+'"></a>\n';else{var e=.5*c.defaultTo(thread.thumbnail_width,140),f=.5*c.defaultTo(thread.thumbnail_height,140);a+='\t<a href="'+(null==(b=d)?"":b)+'">\n\t\t\t<img class="thumbnail" src="'+(null==(b=thread.thumbnail)?"":b)+'" width="'+(null==(b=e)?"":b)+'" height="'+(null==(b=f)?"":b)+'">\n\t\t</a>\n';
}a+='\n\t<div class="thread-content">\n\n\t\t<a class="thread-title" href="'+(null==(b=d)?"":b)+'">'+(null==(b=thread.title)?"":b)+"</a>\n",c.isNil(thread.link_flair_text)||(a+='\n\t\t<span class="link-flair">'+(null==(b=thread.link_flair_text)?"":b)+"</span>\n"),a+='\t\n\t\t<span class="domain">('+(null==(b=thread.domain)?"":b)+')</span>\n\t\t<div class="thread-info">\n\t\t\tsubmitted <span class="thread-time">'+(null==(b=Format.prettyDate(thread.created_utc))?"":b)+'</span> by\n\t\t\t<a class="thread-author author" href="https://www.reddit.com/user/'+(null==(b=thread.author)?"":b)+'">'+(null==(b=thread.author)?"":b)+"</a>\n\t\t",
Reddit.isAll&&(a+='\n\t\t\tto <a class="subreddit-link author" href="/r/'+(null==(b=thread.subreddit)?"":b)+'">/r/'+(null==(b=thread.subreddit)?"":b)+"</a>\n\t\t"),a+='\t\t\n\t\t</div>\n\t\t<div class="total-comments">\n\t\t\t<a class="grey-link" href="'+(null==(b=thread.permalink)?"":b)+'">\n\t\t\t\t<b>'+(null==(b=thread.num_comments)?"":b)+' comments</b>\n\t\t\t</a>\n\t\t\t<a class="grey-link" href="https://www.reddit.com'+(null==(b=thread.permalink)?"":b)+'">\n\t\t\t\t<b>reddit</b>\n\t\t\t</a>\n\t\t</div>\n\t</div>\n</div>';
}return a}};typeof define=="function"&&typeof define.amd=="object"&&define.amd? define(["lodash"],function(t){c=t,t.templates=t.extend(t.templates||{},d)}):g?(c=require("lodash"),(g.exports=d).templates=d,f.templates=d):c&&(c.templates=c.extend(c.templates||{},d))}).call(this);
}return a},threadInfo:function(a){a||(a={});var b;with(a)a=""+('<div id="comment-info">\n\tremoved comments: '+(null==(b=removedComments)?"":b)+"/"+(null==(b=totalComments)?"":b)+" ("+(null==(b=(100*removedComments/totalComments).toFixed(1))?"":b)+'%)\n</div>\n<div id="comment-sort">sorted by: top</div>');return a}};typeof define=="function"&&typeof define.amd=="object"&&define.amd? define(["lodash"],function(t){c=t,t.templates=t.extend(t.templates||{},d)}):h?(c=require("lodash"),(h.exports=d).templates=d,
f.templates=d):c&&(c.templates=c.extend(c.templates||{},d))}).call(this);

11
static/js/search.js
View file

@ -25,17 +25,6 @@ return {
}
};
})();
/*
Comments:
text (body) string
title (title) string
subreddit (subreddit) string
author (author) string
over_18 (over_18) sfw,nsfw,both *
locked (locked) bool *
between (after/before) "date"
sort (sort) asc,desc
*/
var Vars = (function(){
var lookup = {};

35
static/js/subreddit.js
View file

@ -4,10 +4,17 @@ var app = (function(){
return {
loadPage: function() {
Status.loading("Loading subreddit...");
document.title = Reddit.isAll ? 'all subreddits' : Reddit.subreddit;
document.title = Reddit.isAll ? "all subreddits" : Reddit.subreddit;
HTML.main.innerHTML += _.templates.subredditInfo({subreddit: Reddit.subreddit, time: Vars.time});
Fetch2.get(ElasticSearch.subreddit(Reddit.subreddit, Time.difference(Vars.time), Vars.page), "Could not get removed posts")
var urlData = {
subreddit: Reddit.subreddit,
time: Time.difference(Vars.time),
page: Vars.page,
postPerPage: Vars.postPerPage
};
Fetch2.get(ElasticSearch.threadURL+_.templates.elasticSubreddit(urlData), "Could not get removed posts")
.then(Fetch2.json)
.then(function(json){
var startPostNr = (Vars.page - 1) * Vars.postPerPage + 1;
@ -38,30 +45,6 @@ var Vars = (function(){
};
})();
var ElasticSearch = (function(){
return {
subreddit: function(subreddit, time, page){
var condition = '[{"term":{"subreddit":"'+_.toLower(subreddit)+'"}},'+
'{"range":{"created_utc":{"gt":'+time+'}}}]';
if(Reddit.isAll) {
condition = '{"range":{"created_utc":{"gt":'+time+'}}}';
}
return 'https://elastic.pushshift.io/rs/submissions/_search?source={'+
'"query":{'+
'"bool":{'+
'"must":'+condition+
'}'+
'},'+
'"_source":["author","url","subreddit","link_flair_text","score","title","created_utc","selftext","num_comments","domain","permalink","id","thumbnail","thumbnail_height","thumbnail_width"],'+
'"sort":[{"score":"desc"}],'+
'"from":'+(page-1)*Vars.postPerPage+','+
'"size":'+Vars.postPerPage+'}';
}
};
})();
if(isSupported) {
app.loadPage();
}

389
static/js/thread.js
View file

@ -4,282 +4,121 @@ var app = (function(){
return {
loadPage: function() {
// Just fucking crach if the user is retarded
if(_.isUndefined(Reddit.threadID) || _.isUndefined(Reddit.subreddit)) {
if(_.isNil(Reddit.threadID)) {
Status.error("Missing necessary parts of the URL");
return;
}
Status.loading("Loading thread...");
Reddit.fetchToken()
.then(function(){
return Promise.all([
fetch(URLs.thread, Reddit.init)
.then(Fetch2.json)
.then(ThreadHTML.createThread)
.catch(function(error) {
return Promise.reject("Could not get thread from Reddit");
}),
var urlData = {id: parseInt(Reddit.threadID, 36)};
fetch(URLs.pushshiftIDs)
.then(Fetch2.json)
.then(_.property("data"))
.catch(function(error) {
return Promise.reject("Could not get removed comment IDs");
}),
])
})
.then(function(results) {
var thread = results[0];
Comments.allIDs = results[1];
Status.loading("Loading comments from reddit...");
HandleIDs.normal(thread);
return HandleIDs.morechildren()
.catch(function(error){
return Promise.reject("Could not get comments from Reddit (moreChildren)");
});
})
.then(function(){
return Promise.all(_.map(_.uniq(Comments.countinuethread), function(id) {
return fetch(URLs.thread+"/_/"+id.split("_")[1], Reddit.init)
.then(Fetch2.json)
.catch(function(error){ return Promise.reject("Could not get comments from Reddit (continueThisThread)") })
}))
.catch(function(error){
return Promise.reject("Could not get comments from Reddit (continueThisThread)");
});
})
.then(function(smallerThreads){
_.forEach(smallerThreads, function(thread){
HandleIDs.normal(thread);
Promise.all([
Fetch2.get(ElasticSearch.threadURL+_.templates.elasticThread(urlData), "Could not get thread")
.then(Fetch2.json)
.then(function(json){
HTML.main.innerHTML += _.templates.thread({thread: json.hits.hits[0]._source});
return json;
})
Status.loading("Getting removed comments...");
HandleIDs.removed();
ThreadHTML.createCommentInfo(Comments.removed.length);
return Fetch2.multiple(URLs.format(URLs.pushshiftComments, Comments.removed), null, "data")
.catch(function(error){
return Promise.reject("Could not get removed comments");
});
.catch(Fetch2.handleError),
Fetch2.get(ElasticSearch.commentURL+_.templates.elasticComments(urlData), "Could not get removed comments")
.then(Fetch2.json)
.catch(Fetch2.handleError)
])
.then(function(promises){
var commentData = {
removedComments: promises[1].hits.total,
totalComments: promises[0].hits.hits[0]._source.num_comments
};
HTML.main.innerHTML += _.templates.threadInfo(commentData);
Comments.addComments(promises[1]);
Status.loading("Getting remaining comments...");
})
.then(function(removedComments){
Status.loading("Generating comments...");
return Comments.generate(removedComments);
.then(function getRemainingComments() {
return Fetch2.get(ElasticSearch.commentURL+_.templates.elasticCommentIDs({ids:Comments.missing}), "Could not get remaining comments")
.then(Fetch2.json)
.then(function(json){
Comments.addComments(json);
if(Comments.missing.length !== 0) {
getRemainingComments();
}
});
})
.then(function(){
// Make sure to get the permalink comment (even if it's not related to removed/deleted stuff)
if(Comments.isPermalink && !_.includes(Comments.IDs, Comments.getRoot())) {
var urlData = {ids: [Comments.to10(Comments.getRoot())]};
return Fetch2.get(ElasticSearch.commentURL+_.templates.elasticCommentIDs(urlData), "Could not find the specific comment asked for")
.then(Fetch2.json)
.then(function(json){
console.log(json.hits.hits)
Comments.addComments(json);
});
}
})
.then(function(){
HTML.main.innerHTML += '<div id="'+Reddit.threadID+'"></div>';
Status.loading("Generating comments...");
_.forEach(Comments.IDs, function(id){
HTML.main.innerHTML += _.templates.comment({id:id, comment:Comments.lookup[id]});
});
// generate comments
Status.success();
})
.catch(function(error) {
if(_.includes(_.toLower(error), "error")) {
Status.error(error);
} else {
Status.error("Error: "+error);
}
});
.catch(Fetch2.handleError);
}
}})();
// ------------------------------------------------------------------------------
// ----------------------- Store and genrates comments --------------------------
// ------------------------------------------------------------------------------
var Comments = (function() {
var totalComments;
var lookup = {};
var toBeCreated = [];
var getParentComments = function(toLookup){
var newCommentsToLookup = [];
var commentsToFetch = [];
_.forEach(toLookup, function(id){
var parentID = lookup[id].parent_id.split("_")[1];
if(parentID === Reddit.threadID) {} // Has no parent (is parent of thread)
else if(_.includes(Comments.toBeCreated, parentID)) {} // Parent already exists, do nothing
else if(_.includes(newCommentsToLookup, parentID)) {} // Parent already exists (this iteration)
else if(_.has(lookup, parentID)) {
newCommentsToLookup.push(parentID);
} else{
commentsToFetch.push(parentID);
}
Comments.toBeCreated.push(id);
});
return new Promise(function(resolve, reject){
if(_.uniq(commentsToFetch).length !== 0) {
fetch(URLs.singleComments + _.join(_.map(_.uniq(commentsToFetch),function(comments){
return "t1_" + comments;
})), Reddit.init)
.then(Fetch2.json)
.then(function(json){
_.forEach(json.data.children, function(comment) {
lookup[comment.data.id] = comment.data;
newCommentsToLookup.push(comment.data.id);
});
})
.then(function(){
resolve();
});
} else {
resolve();
}
})
.then(function(){
if(newCommentsToLookup.length !== 0) {
return getParentComments(newCommentsToLookup)
}
});
};
return {
ids: [], // The comments we found
morechildren: [],
countinuethread: [],
allIDs: [], // All the comments that we were suppose to find
removed: [],
deleted: [],
toBeCreated: toBeCreated,
lookup: lookup,
IDs: [], // The comments we found
lookup: {},
missing: [],
getTotalComments: function() { return totalComments; },
setTotalComments: function(total) { totalComments = total; },
getRoot: function() {
if(Reddit.permalink !== undefined && Reddit.permalink === "") {
return Reddit.threadID;
}
if(Reddit.permalink === undefined) {
return Reddit.threadID;
}
if(_.has(Comments.lookup, Reddit.permalink)) {
return Comments.lookup[Reddit.permalink].parent_id.split("_")[1];
}
return "";
to36: function(id){
return parseInt(id).toString(36);
},
generate: function(removedComments) {
removedComments.forEach(function(comment){
if(_.includes(Comments.deleted, comment.id)) {
comment["deleted"] = true;
} else {
comment["removed"] = true;
}
Comments.lookup[comment.id] = comment;
to10: function(id){
return parseInt(id, 36);
},
addComments: function(json){
Comments.IDs = _.union(Comments.IDs, _.map(json.hits.hits, function(comment){
return Comments.to36(comment._id);
}));
_.forEach(json.hits.hits, function(comment){
comment._source.parent_id = _.isNil(comment._source.parent_id) ? Reddit.threadID : Comments.to36(comment._source.parent_id);
Comments.lookup[Comments.to36(comment._id)] = comment._source;
});
Comments.missing = _.reduce(json.hits.hits, function(array, comment){
if(comment._source.parent_id !== Reddit.threadID && !_.includes(Comments.IDs, comment._source.parent_id)) {
array.push(Comments.to10(comment._source.parent_id));
}
return array;
}, []);
},
Comments.removed = _.map(removedComments, function(comment){
return comment.id;
});
return getParentComments(Comments.removed)
.then(function(){
ThreadHTML.createCommentSection();
ThreadHTML.createComments();
})
}
}})();
// ------------------------------------------------------------------------------
// ----------------- Handle comments from different requests --------------------
// ------------------------------------------------------------------------------
var HandleIDs = (function(){
var normal = function(thread){
return _.flatten(_.map(thread[1].data.children, Extract.normal))
};
var morechildren = function(){
return Promise.all(_.map(_.uniq(Comments.morechildren), function(idArray){
return Fetch2.multiple(URLs.format(URLs.moreChildren, idArray), Reddit.init);
}))
.then(function(responseArrays){
Comments.morechildren.length = 0;
_.forEach(responseArrays, function(responseArray){
_.forEach(responseArray, function(response){
_.forEach(response.jquery[10][3][0], function(comment){
Extract.normal(comment);
})
});
});
}).then(function(){
if(Comments.morechildren.length !== 0) {
return morechildren();
}
});
};
var removed = function(){
Comments.removed = _.difference(Comments.allIDs, Comments.ids);
Comments.ids.forEach(function(id){
if(! _.has(Comments.lookup, id)) {
return;
}
if(Comments.lookup[id].body === "[removed]") {
Comments.removed.push(id);
} else if (Comments.lookup[id].body === "[deleted]"){
Comments.removed.push(id);
Comments.deleted.push(id);
}
});
Comments.removed = _.uniq(Comments.removed);
};
return {
normal: normal,
morechildren: morechildren,
removed: removed
};
})();
// ------------------------------------------------------------------------------
// ----------------------- 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;
getRoot: function() {
if(Reddit.permalink !== undefined && Reddit.permalink !== "") {
return Reddit.permalink;
}
};
return {
normal: normal
};
return Reddit.threadID;
},
isPermalink: (Reddit.permalink !== undefined && Reddit.permalink !== "")
};
})();
// ------------------------------------------------------------------------------
// ---------------------------- Generating HTML ---------------------------------
// ------------------------------------------------------------------------------
/*
var ThreadHTML = (function(){
var mainDiv = document.getElementById("main");
// I actually haven't found a better way of doing this...
// Imgur has image-links with no indication that they are actually images
var imageHosts = ["i.redd.it", "flickr.com", "i.imgur.com", "imgur.com", "m.imgur.com"];
@ -330,24 +169,6 @@ var ThreadHTML = (function(){
return data;
};
var createCommentInfo = function(totalRemovedComments){
var div = document.createElement("div");
div.innerHTML = ' \
<div id="comment-info"> \
removed comments: '+totalRemovedComments+'/'+Comments.getTotalComments()+' ('+(100 * totalRemovedComments / Comments.getTotalComments()).toFixed(1)+'%) \
</div> \
<div id="comment-sort">sorted by: top</div> \
';
mainDiv.appendChild(div);
};
var createCommentSection = function(){
var div = document.createElement("div");
div.id = Comments.getRoot();
mainDiv.appendChild(div);
};
var createComments = function(){
var commentsToCreate = _.sortBy(_.uniq(Comments.toBeCreated), function(id) {
return Comments.lookup[id].score;
@ -379,39 +200,7 @@ var ThreadHTML = (function(){
}
};
var createComment = function(comment){
var isRemoved = _.has(comment,"removed");
var isDeleted = _.has(comment,"deleted");
// Sorry
var commentCss = "comment-" + (isRemoved ? "removed" : (isDeleted ? "deleted" : (comment.depth % 2 == 0 ? "even" : "odd")));
var commentDiv = document.createElement("div");
commentDiv.id = comment.id;
commentDiv.className = "comment " + commentCss;
commentDiv.innerHTML = ' \
<div class="comment-head"> \
<a href="javascript:void(0)" class="author">[–]</a> \
<a href="https://www.reddit.com/user/'+comment.author+'" class="author comment-author">'+comment.author+(isDeleted ? " (deleted by user)" : "")+'</a> \
<span class="comment-score">'+Format.prettyScore(comment.score)+' point'+((comment.score == 1) ? '': 's')+'</span> \
<span class="comment-time">'+Format.prettyDate(comment.created_utc)+'</span> \
</div> \
<div class="comment-body">'+(comment.body === "[removed]" && isRemoved ? "<p>[likely removed by automoderator]</p>" : Format.parse(comment.body))+'</div> \
<div class="comment-links"> \
<a href="/r/'+Reddit.subreddit+'/comments/'+Reddit.threadID+'/_/'+comment.id+'/">permalink</a> \
<a href="https://www.reddit.com/r/'+Reddit.subreddit+'/comments/'+Reddit.threadID+'/_/'+comment.id+'/">reddit</a> \
</div>';
return commentDiv;
};
return {
createThread: createThread,
createCommentInfo: createCommentInfo,
createCommentSection: createCommentSection,
createComments: createComments
}
})();
})();*/
if(isSupported) {
app.loadPage();

1
subreddit.html
View file

@ -26,7 +26,6 @@
<script src="/static/js/libraries/lodash.templates.min.js"></script>
<script src="/static/js/polyfills/promise.min.js"></script>
<script src="/static/js/polyfills/fetch.js"></script>
<script src="/static/js/id.js"></script>
<script src="/static/js/functions.js"></script>
<script src="/static/js/subreddit.js"></script>
</body>

1
thread.html
View file

@ -26,7 +26,6 @@
<script src="/static/js/libraries/lodash.templates.min.js"></script>
<script src="/static/js/polyfills/promise.min.js"></script>
<script src="/static/js/polyfills/fetch.js"></script>
<script src="/static/js/id.js"></script>
<script src="/static/js/functions.js"></script>
<script src="/static/js/thread.js"></script>
</body>