From 35fe2e983a875e60922e1d8fb526404d4bb33396 Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Tue, 20 Mar 2018 13:19:31 -0500
Subject: [PATCH] Remove now defunct base_xenforoforum show_chapter_authors
 option.  Sites changed threadmarks.rss both to be unusable by FFF *and* not
 include post authors.

---
 calibre-plugin/plugin-defaults.ini               | 6 ------
 fanficfare/adapters/base_xenforoforum_adapter.py | 6 +-----
 fanficfare/configurable.py                       | 2 --
 fanficfare/defaults.ini                          | 6 ------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini
index 177a7ad9..6720a9ac 100644
--- a/calibre-plugin/plugin-defaults.ini
+++ b/calibre-plugin/plugin-defaults.ini
@@ -619,12 +619,6 @@ always_use_forumtags:false
 ## skip_threadmarks_categories.
 #apocrypha_to_omake:false
 
-## When chapters are collected using threadmarks.rss, the post author
-## is also collected. If there's more than author for threadmarked
-## posts and show_chapter_authors:true, " by AuthorName" will appended
-## to each chapter title.
-#show_chapter_authors:false
-
 ## SV & SB (and possibly QQ and AH) like to use sprite smilies --
 ## smiley images that are all in one image file for performance and
 ## are shown by CSS background with offsets.  Epub viewers don't like
diff --git a/fanficfare/adapters/base_xenforoforum_adapter.py b/fanficfare/adapters/base_xenforoforum_adapter.py
index ce203256..4ca47dae 100644
--- a/fanficfare/adapters/base_xenforoforum_adapter.py
+++ b/fanficfare/adapters/base_xenforoforum_adapter.py
@@ -332,10 +332,6 @@ class BaseXenForoForumAdapter(BaseSiteAdapter):
                         if tmcat_name != "Threadmarks":
                             prepend = tmcat_name+" - "
 
-                    append=""
-                    if 'author' in tm and multi_authors and self.getConfig('show_chapter_authors',False):
-                        append=" by "+tm['author']
-
                     if 'date' in tm:
                         date = tm['date']
                         if not self.story.getMetadataRaw('datePublished') or date < self.story.getMetadataRaw('datePublished'):
@@ -346,7 +342,7 @@ class BaseXenForoForumAdapter(BaseSiteAdapter):
                     if 'tmcat_num' in tm and 'tmcat_index' in tm:
                         self.threadmarks_for_reader[self.normalize_chapterurl(tm['url'])] = (tm['tmcat_num'],tm['tmcat_index'])
 
-                    self.chapterUrls.append((prepend+tm['title']+append,tm['url']))
+                    self.chapterUrls.append((prepend+tm['title'],tm['url']))
 
             souptag = souptag.find('li',{'class':'message'}) # limit first post for date stuff below. ('#' posts above)
 
diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py
index a66bb0a4..4f1a0057 100644
--- a/fanficfare/configurable.py
+++ b/fanficfare/configurable.py
@@ -250,7 +250,6 @@ def get_valid_set_options():
                'remove_spoilers':(base_xenforo_list,None,boollist),
                'legend_spoilers':(base_xenforo_list,None,boollist),
                'apocrypha_to_omake':(base_xenforo_list,None,boollist),
-               'show_chapter_authors':(base_xenforo_list,None,boollist),
                'replace_failed_smilies_with_alt_text':(base_xenforo_list,None,boollist),
                'fix_pseudo_html': (['webnovel.com'], None, boollist)
                }
@@ -449,7 +448,6 @@ def get_valid_keywords():
                  'remove_spoilers',
                  'legend_spoilers',
                  'apocrypha_to_omake',
-                 'show_chapter_authors',
                  'skip_threadmarks_categories',
                  'normalize_text_links',
                  'internalize_text_links',
diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini
index 9b00191e..59276c85 100644
--- a/fanficfare/defaults.ini
+++ b/fanficfare/defaults.ini
@@ -646,12 +646,6 @@ always_use_forumtags:false
 ## skip_threadmarks_categories.
 #apocrypha_to_omake:false
 
-## When chapters are collected using threadmarks.rss, the post author
-## is also collected. If there's more than author for threadmarked
-## posts and show_chapter_authors:true, " by AuthorName" will appended
-## to each chapter title.
-#show_chapter_authors:false
-
 ## SV & SB (and possibly QQ and AH) like to use sprite smilies --
 ## smiley images that are all in one image file for performance and
 ## are shown by CSS background with offsets.  Epub viewers don't like