Merge pull request 'main' (#4) from teddit/teddit:main into changelog

Reviewed-on: https://codeberg.org/random_guy52/teddit/pulls/4

inc/processJsonSubreddit.js

@@ -67,6 +67,7 @@ module.exports = function() {
               link_flair_text: data.link_flair_text,
               locked: data.locked,
               media: data.media,
+              selftext_html: data.selftext_html,
               num_comments: data.num_comments,
               over_18: data.over_18,
               permalink: data.permalink,

static/css/dark.css

@@ -136,6 +136,16 @@ body.dark .score .arrow {
 body.dark #links .link .entry .meta a {
 	color: #c7c7c7;
 }
+body.dark #links .link .entry .selftext {
+  background: #0a0a0a;
+  border: 1px solid #404040;
+}
+body.dark #links .link .entry details .line {
+  width: 16px;
+  margin-top: 3px;
+  background: black;
+  border: 1px solid #6f6f6f;
+}
 body.dark .content .bottom img {
 	filter: invert(1);
 }

static/css/styles.css

@@ -443,6 +443,54 @@ footer a {
 #links.search .link .meta a.comments {
   margin-left: 0px;
 }
+#links .link .entry .meta .links .selftext a {
+  color: var(--linkcolor);
+  font-weight: initial;
+}
+#links .link .entry .selftext {
+  unicode-bidi: isolate;
+  background-color: #fafafa;
+  border: 1px solid #369;
+  border-radius: 7px;
+  padding: 5px 10px;
+  margin: 10px auto 5px 0px;
+  font-size: 0.84rem;
+  max-width: 60em;
+  word-wrap: break-word;
+  float: left;
+  width: calc(100% - 100px);
+  margin-right: 11000px;
+  overflow: hidden;
+  cursor: initial;
+}
+#links .link .entry details {
+  margin: 0px 10px 0px 0px;
+  font-size: 0.7rem;
+}
+#links .link .entry details[open] {
+  width: 100%;
+}
+#links .link .entry details summary {
+  font-size: 0.833rem;
+  list-style-type: none;
+  padding: 4px;
+}
+#links .link .entry  details > summary::-webkit-details-marker {
+  display: none;
+}
+#links .link .entry  details summary:hover {
+  text-decoration: underline;
+  cursor: pointer;
+}
+#links .link .entry details .line {
+  width: 16px;
+  margin-top: 3px;
+  background: #979797;
+  border: 1px solid #b3b0b0;
+}
+#links .link .entry details .line:first-child {
+  margin-top: 0px;
+}
 /* COMMENTS */
 .comment {
   font-size: 0.83rem;
@@ -1400,6 +1448,9 @@ code {
     width: calc(100% - 20px);
     min-height: 100vh;
   }
+  #links .link .entry .selftext {
+    width: calc(100% - 10%);
+  }
 }
 @media only screen and (max-width: 600px) {
   #sidebar {

views/index.pug

@@ -102,6 +102,14 @@ html
                 .links
                   if link.over_18
                     span.tag.nsfw NSFW
+                  if link.selftext_html
+                    details
+                      summary
+                        .line
+                        .line
+                        .line
+                      .selftext
+                        != unescape(link.selftext_html)
                   a(href="" + link.permalink + "", class="comments")
                     | #{link.num_comments} comments
       #search

views/subreddit.pug

@@ -128,6 +128,14 @@ html
                     .links
                       if link.over_18
                         span.tag.nsfw NSFW
+                      if link.selftext_html
+                        details
+                          summary
+                            .line
+                            .line
+                            .line
+                          .selftext
+                            != unescape(link.selftext_html)
                       a(href="" + link.permalink + "", class="comments")
                         | #{link.num_comments} comments
           if json.info.before || json.info.after