Formatting of post

fedicurses.py

@@ -7,10 +7,29 @@ def newLine(ncwin, lines=1):
     ncwin.move(cy + lines, 0)
 
 def printPost(win, post, parser):
-    win.addstr(post["account"]["acct"], curses.A_BOLD)
-    win.addstr(':', curses.A_BOLD)
+    if (post["reblog"] is not None):
+        win.addstr("{} boosted {}:".format(post["account"]["acct"],
+                                           post["reblog"]["account"]["acct"]),
+                   curses.A_BOLD)
+    else:
+        win.addstr("{}:".format(post["account"]["acct"]), curses.A_BOLD)
     newLine(win)
+    if (post["spoiler_text"] != ""):
+        win.addstr(post["spoiler_text"], curses.A_UNDERLINE)
+        newLine(win)
     parser.feed(post["content"])
+    if parser.openp:
+        newLine(win)
+
+    botstring = "{} @ {} UTC".format(post["visibility"],
+                                     post["created_at"
+                                         ].strftime(
+                                             "%Y-%m-%d %H:%M:%S"))
+    cy, cx = win.getyx()
+    my, mx = win.getmaxyx()
+    win.addstr(cy, mx - len(botstring), botstring, curses.A_UNDERLINE)
+
+    newLine(win, 1)
 
 def printAtLevel(stdscr, col1, col2, posts, parser, level):
     col1.clear()
@@ -18,6 +37,7 @@ def printAtLevel(stdscr, col1, col2, posts, parser, level):
     col1.move(0, 0)
     col2.move(0, 0)
     printPost(col1, posts[level], parser)
+    newLine(col1)
     printPost(col1, posts[(level + 1) % len(posts)], parser)
     try:
         col2.addstr(str(posts[level]))
@@ -34,19 +54,26 @@ class PostParser(HTMLParser):
         self.win = ncwin
         self.defncatt = defncatt
         self.curatt = defncatt
+        self.openp = False
 
     def handle_starttag(self, tag, attrs):
         if tag == 'p':
             self.curatt = self.defncatt
-        elif tag == 'strong':
+            # newLine(self.win)
+        elif tag == 'strong' or tag == 'b':
+            self.curatt = self.curatt ^ curses.A_REVERSE
+        elif tag == 'em' or tag == 'i':
             self.curatt = self.curatt ^ curses.A_BOLD
         elif tag == 'br':
             newLine(self.win)
 
     def handle_endtag(self, tag):
         if tag == 'p':
-            newLine(self.win, 2)
-        elif tag == 'strong':
+            newLine(self.win)
+            self.openp = False
+        elif tag == 'strong' or tag == 'b':
+            self.curatt = self.curatt ^ curses.A_REVERSE
+        elif tag == 'em' or tag == 'i':
             self.curatt = self.curatt ^ curses.A_BOLD
 
     def handle_data(self, data):
@@ -54,6 +81,7 @@ class PostParser(HTMLParser):
             self.win.addstr(data, self.curatt)
         except curses.error:
             pass
+        self.openp = True
 
 
 # print(mastodon.timeline()[0]["content"])