Merge branch 'v3' into Av2

Conflicts: builds/4chan-X.js builds/4chan-X.user.js builds/crx.crx builds/crx/script.js src/config.coffee src/css/style.css src/features/misc/announcementhiding.coffee src/features/misc/header.coffee src/features/misc/keybinds.coffee src/main.coffee src/settings.coffee
2013-04-22 21:41:24 -07:00 · 2013-04-22 21:41:24 -07:00 · 3d07017708
commit 3d07017708
parent 1484cd5609 4d45142345
75 changed files with 1203 additions and 849 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,6 @@
 node_modules/
-tmp/
-4chan_x.user.js
-Cakefile
-script.coffee
 *~
 *.db
+tmp-crx/
+tmp-userjs/
+tmp-userscript/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,5 @@
+- Added the option `Hide Unread Count at (0)`, disabled by default.
+
 ### 3.1.4 - *2013-04-17*

 - Fix QR remembering the file spoiler state when it shouldn't, for real this time.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,4 +1,6 @@
-## Reporting bugs
+## Reporting bugs and suggestions
+
+Reporting bugs:

 1. Make sure both your **browser** and **4chan X** are up to date.
 2. Disable your other extensions & scripts to identify conflicts.
@ -13,6 +15,12 @@ Open your console with:
 - `Ctrl + Shift + K` on Firefox.
 - `Ctrl + Shift + O` on Opera.

+Respect these guidelines:
+- Describe the issue clearly, put some effort into it. A one-liner isn't a good enough description.
+- If you want to get your suggestion implemented sooner, make it convincing.
+- If you want to criticize, make it convincing and constructive.
+- Be mature. Act like an idiot and you will be blocked without warning.
+
 ## Development & Contribution

 ### Get started
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@ -5,6 +5,11 @@ module.exports = (grunt) ->
    process:
      data: pkg

+  shellOptions =
+    stdout:      true
+    stderr:      true
+    failOnError: true
+
  # Project configuration.
  grunt.initConfig
    pkg: pkg
@ -12,12 +17,12 @@ module.exports = (grunt) ->
      coffee:
        options: concatOptions
        src: [
-          'src/code/config.coffee'
-          'src/code/globals.coffee'
+          'src/config.coffee'
+          'src/globals.coffee'
          'src/lib/*.coffee'
-          'src/code/*/*.coffee'
-          'src/code/settings.coffee'
-          'src/code/main.coffee'
+          'src/features/*/*.coffee'
+          'src/settings.coffee'
+          'src/main.coffee'
        ]
        dest: 'tmp-<%= pkg.type %>/script.coffee'

@ -68,27 +73,25 @@ module.exports = (grunt) ->
        'build-userscript'
      ]

-    exec:
+    shell:
      commit:
-        command: ->
-          release = "#{pkg.meta.name} v#{pkg.version}"
-          return [
-            'git checkout ' + pkg.meta.mainBranch,
-            'git commit -am "Release ' + release + '."',
-            'git tag -a ' + pkg.version + ' -m "' + release + '."',
-            'git tag -af stable-v3 -m "' + release + '."'
-          ].join(' && ');
+        options: shellOptions
+        command: [
+          'git checkout <%= pkg.meta.mainBranch %>',
+          'git commit -am "Release <%= pkg.meta.name %> v<%= pkg.version %>."',
+          'git tag -a <%= pkg.version %> -m "<%= pkg.meta.name %> v<%= pkg.version %>."',
+          'git tag -af stable-v3 -m "<%= pkg.meta.name %> v<%= pkg.version %>."'
+        ].join(' && ')
        stdout: true

      push:
-        command: 'git push origin --all && git push origin --tags'
-        stdout: true
+        options: shellOptions
+        command: 'git push origin --tags -f && git push origin --all' 

    watch:
      all:
        options:
          interrupt: true
-          nospawn:   true
        files: [
          'Gruntfile.coffee'
          'package.json'
@ -120,7 +123,7 @@ module.exports = (grunt) ->
  grunt.loadNpmTasks 'grunt-contrib-concat'
  grunt.loadNpmTasks 'grunt-contrib-copy'
  grunt.loadNpmTasks 'grunt-contrib-watch'
-  grunt.loadNpmTasks 'grunt-exec'
+  grunt.loadNpmTasks 'grunt-shell'

  grunt.registerTask 'default', [
    'build'
@ -161,8 +164,8 @@ module.exports = (grunt) ->

  grunt.registerTask 'release', [
    'default'
-    'exec:commit'
-    'exec:push'
+    'shell:commit'
+    'shell:push'
  ]

  grunt.registerTask 'patch',   [
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
--- a/builds/appchan-x.zip
+++ b/builds/appchan-x.zip
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
--- a/package.json
+++ b/package.json
@ -18,15 +18,15 @@
  },
  "devDependencies": {
    "grunt": "~0.4.1",
-    "grunt-bump": "~0.0.0",
-    "grunt-concurrent": "~0.1.1",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-coffee": "~0.6.6",
+    "grunt-bump": "~0.0.2",
+    "grunt-concurrent": "~0.2.0",
+    "grunt-contrib-clean": "~0.4.1",
+    "grunt-contrib-coffee": "~0.6.7",
    "grunt-contrib-compress": "~0.4.10",
    "grunt-contrib-concat": "~0.2.0",
    "grunt-contrib-copy": "~0.4.1",
    "grunt-contrib-watch": "~0.3.1",
-    "grunt-exec": "~0.4.0"
+    "grunt-shell": "~0.2.2"
  },
  "repository": {
    "type": "git",
--- a/src/code/misc/redirection.coffee
+++ b/src/code/misc/redirection.coffee
@ -1,82 +0,0 @@
-Redirect =
-  image: (boardID, filename) ->
-    # Do not use g.BOARD, the image url can originate from a cross-quote.
-    switch boardID
-      when 'a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'
-        "//archive.foolz.us/#{boardID}/full_image/#{filename}"
-      when 'u'
-        "//nsfw.foolz.us/#{boardID}/full_image/#{filename}"
-      when 'po'
-        "//archive.thedarkcave.org/#{boardID}/full_image/#{filename}"
-      when 'ck', 'fa', 'lit', 's4s'
-        "//fuuka.warosu.org/#{boardID}/full_image/#{filename}"
-      when 'cgl', 'g', 'mu', 'w'
-        "//rbt.asia/#{boardID}/full_image/#{filename}"
-      when 'an', 'k', 'toy', 'x'
-        "http://archive.heinessen.com/#{boardID}/full_image/#{filename}"
-      when 'c'
-        "//archive.nyafuu.org/#{boardID}/full_image/#{filename}"
-  post: (boardID, postID) ->
-    # XXX foolz had HSTS set for 120 days, which broke XHR+CORS+Redirection when on HTTP.
-    # Remove necessary HTTPS procotol in September 2013.
-    switch boardID
-      when 'a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'
-        "https://archive.foolz.us/_/api/chan/post/?board=#{boardID}&num=#{postID}"
-      when 'u'
-        "https://nsfw.foolz.us/_/api/chan/post/?board=#{boardID}&num=#{postID}"
-      when 'c', 'int', 'out', 'po'
-        "//archive.thedarkcave.org/_/api/chan/post/?board=#{boardID}&num=#{postID}"
-    # for fuuka-based archives:
-    # https://github.com/eksopl/fuuka/issues/27
-  to: (data) ->
-    {boardID} = data
-    switch boardID
-      when 'a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'
-        Redirect.path '//archive.foolz.us', 'foolfuuka', data
-      when 'u'
-        Redirect.path '//nsfw.foolz.us', 'foolfuuka', data
-      when 'int', 'out', 'po'
-        Redirect.path '//archive.thedarkcave.org', 'foolfuuka', data
-      when 'ck', 'fa', 'lit', 's4s'
-        Redirect.path '//fuuka.warosu.org', 'fuuka', data
-      when 'diy', 'g', 'sci'
-        Redirect.path '//archive.installgentoo.net', 'fuuka', data
-      when 'cgl', 'mu', 'w'
-        Redirect.path '//rbt.asia', 'fuuka', data
-      when 'an', 'fit', 'k', 'mlp', 'r9k', 'toy', 'x'
-        Redirect.path 'http://archive.heinessen.com', 'fuuka', data
-      when 'c'
-        Redirect.path '//archive.nyafuu.org', 'fuuka', data
-      else
-        if data.threadID then "//boards.4chan.org/#{boardID}/" else ''
-  path: (base, archiver, data) ->
-    if data.isSearch
-      {boardID, type, value} = data
-      type = if type is 'name'
-        'username'
-      else if type is 'MD5'
-        'image'
-      else
-        type
-      value = encodeURIComponent value
-      return if archiver is 'foolfuuka'
-        "#{base}/#{boardID}/search/#{type}/#{value}"
-      else if type is 'image'
-        "#{base}/#{boardID}/?task=search2&search_media_hash=#{value}"
-      else
-        "#{base}/#{boardID}/?task=search2&search_#{type}=#{value}"
-
-    {boardID, threadID, postID} = data
-    # keep the number only if the location.hash was sent f.e.
-    path = if threadID
-      "#{boardID}/thread/#{threadID}"
-    else
-      "#{boardID}/post/#{postID}"
-    if archiver is 'foolfuuka'
-      path += '/'
-    if threadID and postID
-      path += if archiver is 'foolfuuka'
-        "##{postID}"
-      else
-        "#p#{postID}"
-    "#{base}/#{path}"
--- a/src/code/config.coffee
+++ b/src/code/config.coffee
@ -9,18 +9,14 @@ Config =
        false
        'Link to external catalog instead of the internal one.'
      ]
-      'Enable 4chan\'s Extension': [
-        false
-        'Compatibility between <%= meta.name %> and 4chan\'s inline extension is NOT guaranteed.'
-      ]
-      'Fixed Header': [
-        false
-        'Mayhem X\'s Fixed Header (kinda).'
-      ]
      'Custom Board Navigation': [
        false
        'Show custom links instead of the full board list.'
      ]
+      'QR Shortcut': [
+        false,
+        'Adds a small [QR] link in the header.'
+      ]
      'Announcement Hiding': [
        true
        'Add button to hide 4chan announcements.'
@ -105,10 +101,6 @@ Config =
        true
        'Add buttons to hide single replies.'
      ]
-      'Hiding Buttons': [
-        true
-        'Add buttons to hide threads / replies, in addition to menu links.'
-      ]
      'Stubs': [
        true
        'Show stubs of hidden threads / replies.'
@ -145,7 +137,7 @@ Config =
      ]
      'Fappe Tyme': [
        false
-        'Hide posts without images when toggled.'
+        'Hide posts without images when toggled. *hint* *hint*'
      ]

    'Menu':
@ -153,6 +145,10 @@ Config =
        true
        'Add a drop-down menu to posts.'
      ]
+      'Report Link': [
+        true
+        'Add a report link to the menu.'
+      ]
      'Thread Hiding Link': [
        true
        'Add a link to hide entire threads.'
@ -160,19 +156,17 @@ Config =
      'Reply Hiding Link': [
        true
        'Add a link to hide single replies.'
-      ] 
-      'Report Link': [
-        true
-        'Add a report link to the menu.'
      ]
      'Delete Link': [
        true
        'Add post and image deletion links to the menu.'
      ]
+      <% if (type === 'crx') { %>
      'Download Link': [
        true
        'Add a download with original filename link to the menu. Chrome-only currently.'
      ]
+      <% } %>
      'Archive Link': [
        true
        'Add an archive link to the menu.'
@ -187,6 +181,10 @@ Config =
        true
        'Show the unread posts count in the tab title.'
      ]
+      'Hide Unread Count at (0)': [
+        false
+        'Hide the unread posts count when it reaches 0.'
+      ]
      'Unread Tab Icon': [
        true
        'Show a different favicon when there are unread posts.'
@ -195,6 +193,10 @@ Config =
        true
        'Show a line to distinguish read posts from unread ones.'
      ]
+      'Scroll to Last Read Post': [
+        true
+        'Scroll back to the last read post when reopening a thread.'
+      ]
      'Thread Excerpt': [
        true
        'Show an excerpt of the thread in the tab title.'
--- a/src/css/icons.horz.css
+++ b/src/css/icons.horz.css
@ -78,7 +78,7 @@ body > a[style="cursor: pointer; float: right;"]::after {
 #boardNavDesktopFoot {
  top: 16px !important;
 }
-#{if _conf['Boards Navigation'] is 'top' or _conf['Boards Navigation'] is 'sticky top' then '#boardNavDesktop' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} {
+#{if _conf['Boards Navigation'] is 'top' or _conf['Boards Navigation'] is 'sticky top' then '#header-bar' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} {
  #{if _conf['4chan SS Navigation']
    "padding-#{align}: #{iconOffset}px;"
  else
--- a/src/css/icons.vert.css
+++ b/src/css/icons.vert.css
@ -78,7 +78,7 @@ div.navLinks > a:first-of-type::after {
  width: #{233 + Style.sidebarOffset.W}px !important;
  #{align}: 18px !important;
 }
-#{if _conf['Boards Navigation'] is 'top' or _conf['Boards Navigation'] is 'sticky top' then '#boardNavDesktop' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} {
+#{if _conf['Boards Navigation'] is 'top' or _conf['Boards Navigation'] is 'sticky top' then '#header-bar' else if _conf['Pagination'] is 'top' or _conf['Pagination'] is 'sticky top' then '.pagelist'} {
  #{if _conf['4chan SS Navigation']
    "padding-#{align}: #{iconOffset}px;"
  else
--- a/src/css/layout.css
+++ b/src/css/layout.css
@ -146,7 +146,7 @@ hr {
  margin: 1.5px;
 }
 /* Header */
-#boardNavDesktop {
+#header-bar {
  z-index: 6;
  border-width: 1px;
  position: absolute;
@ -168,34 +168,34 @@ else "
 " else ""}
   text-align: #{_conf["Navigation Alignment"]};
 }
-.fixed #boardNavDesktop {
+.fixed #header-bar {
  position: fixed;
 }
-.top #boardNavDesktop {
+.top #header-bar {
  top: 0;
  border-top-width: 0;
  #{if _conf["Rounded Edges"] then "border-radius: 0 0 3px 3px;" else ""}"
 }
-.fixed.bottom #boardNavDesktop {
+.fixed.bottom #header-bar {
  bottom: 0;
  border-bottom-width: 0;
  #{if _conf["Rounded Edges"] then "border-radius: 3px 3px 0 0;" else ""}"
 }
-.hide #boardNavDesktop {
+.hide #header-bar {
  position: fixed;
  top: 110%;
  bottom: auto;
 }
 /* Header Autohide */
-.fixed #boardNavDesktop.autohide:not(:hover) {
+.fixed #header-bar.autohide:not(:hover) {
  box-shadow: none;
  transition: all .8s .6s cubic-bezier(.55, .055, .675, .19);
 }
-.fixed.top #boardNavDesktop.autohide:not(:hover) {
+.fixed.top #header-bar.autohide:not(:hover) {
  margin-bottom: -1em;
  #{agent}transform: translateY(-100%);
 }
-.fixed.bottom #boardNavDesktop.autohide:not(:hover) {
+.fixed.bottom #header-bar.autohide:not(:hover) {
  #{agent}transform: translateY(100%);
 }
 #toggle-header-bar {
@ -204,22 +204,22 @@ else "
  height: 10px;
  position: absolute;
 }
-#boardNavDesktop #toggle-header-bar {
+#header-bar #toggle-header-bar {
  display: none;
 }
-.fixed #boardNavDesktop #toggle-header-bar {
+.fixed #header-bar #toggle-header-bar {
  display: block;
 }
-.fixed #boardNavDesktop #toggle-header-bar {
+.fixed #header-bar #toggle-header-bar {
  cursor: n-resize;
 }
-.fixed.top boardNavDesktop #toggle-header-bar {
+.fixed.top header-bar #toggle-header-bar {
  top: 100%;
 }
-.fixed.bottom #boardNavDesktop #toggle-header-bar {
+.fixed.bottom #header-bar #toggle-header-bar {
  bottom: 100%;
 }
-.fixed #boardNavDesktop #header-bar.autohide #toggle-header-bar {
+.fixed #header-bar #header-bar.autohide #toggle-header-bar {
  cursor: s-resize;
 }
 /* Notifications */
@ -345,7 +345,7 @@ else "
 .pagelist div {
  vertical-align: middle;
 }
-#boardNavDesktop a {
+#header-bar a {
  font-size: #{parseInt(_conf["Font Size"], 10)}px;
 }
 #{if _conf["Hide Navigation Decorations"] then "
--- a/src/css/theme.css
+++ b/src/css/theme.css
@ -173,7 +173,7 @@ textarea.field:focus {
  background: #{theme["Highlighted Reply Background"]};
  border: 1px solid #{theme["Highlighted Reply Border"]};
 }
-#boardNavDesktop,
+#header-bar,
 .pagelist {
  background: #{theme["Navigation Background"]};
  border-style: solid;
@ -286,7 +286,7 @@ textarea {
  border: 1px solid #{theme["Buttons Border"]};
 }
 .pages a,
-#boardNavDesktop a {
+#header-bar a {
  color: #{theme["Navigation Links"]};
 }
 input[type=checkbox]:checked + .rice {
@ -331,7 +331,7 @@ a .postertrip:hover,
 a:hover {
  color: #{theme["Hovered Links"]};
 }
-#boardNavDesktop a:hover,
+#header-bar a:hover,
 #boardTitle a:hover {
  color: #{theme["Hovered Navigation Links"]};
 }
--- a/src/features/filtering/anonymize.coffee
+++ b/src/features/filtering/anonymize.coffee
--- a/src/features/filtering/filter.coffee
+++ b/src/features/filtering/filter.coffee
--- a/src/features/filtering/recursion.coffee
+++ b/src/features/filtering/recursion.coffee
--- a/src/features/filtering/replyhiding.coffee
+++ b/src/features/filtering/replyhiding.coffee
--- a/src/features/filtering/strikethrough.coffee
+++ b/src/features/filtering/strikethrough.coffee
--- a/src/features/filtering/threadhiding.coffee
+++ b/src/features/filtering/threadhiding.coffee
@ -127,7 +127,7 @@ ThreadHiding =
    ThreadHiding.saveHiddenState thread

  hide: (thread, makeStub=Conf['Stubs']) ->
-    return if thread.hidden
+    return if thread.isHidden 
    {OP} = thread
    threadRoot = OP.nodes.root.parentNode
    threadRoot.hidden = thread.isHidden = true
--- a/src/features/imaging/fappetyme.coffee
+++ b/src/features/imaging/fappetyme.coffee
--- a/src/features/imaging/imageexpand.coffee
+++ b/src/features/imaging/imageexpand.coffee
@ -175,7 +175,7 @@ ImageExpand =
      $.event 'AddMenuEntry',
        type: 'header'
        el: el
-        order: 80
+        order: 105
        subEntries: subEntries

    createSubEntry: (type, config) ->
--- a/src/features/imaging/imagehover.coffee
+++ b/src/features/imaging/imagehover.coffee
--- a/src/features/imaging/imagereplace.coffee
+++ b/src/features/imaging/imagereplace.coffee
--- a/src/features/imaging/revealspoiler.coffee
+++ b/src/features/imaging/revealspoiler.coffee
--- a/src/features/linkification/linkify.coffee
+++ b/src/features/linkification/linkify.coffee
--- a/src/features/menu/archivelink.coffee
+++ b/src/features/menu/archivelink.coffee
--- a/src/features/menu/deletelink.coffee
+++ b/src/features/menu/deletelink.coffee
--- a/src/features/menu/downloadlink.coffee
+++ b/src/features/menu/downloadlink.coffee
@ -1,14 +1,7 @@
 DownloadLink =
  init: ->
-    <% if (type === 'userscript') { %>
-    # Firefox won't let us download cross-domain content.
-    return
-    <% } %>
    return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Download Link']

-    # Test for download feature support.
-    return unless 'download' of $.el 'a'
-
    a = $.el 'a',
      className: 'download-link'
      textContent: 'Download file'
--- a/src/features/menu/menu.coffee
+++ b/src/features/menu/menu.coffee
--- a/src/features/menu/reportlink.coffee
+++ b/src/features/menu/reportlink.coffee
--- a/src/features/misc/announcementhiding.coffee
+++ b/src/features/misc/announcementhiding.coffee
@ -12,6 +12,7 @@ PSAHiding =

    PSAHiding.btn = btn = $.el 'a',
      title: 'Toggle announcement.'
+      innerHTML: '<span></span>'
      href: 'javascript:;'
      textContent: '[ - ]'
    $.on btn, 'click', PSAHiding.toggle
--- a/src/features/misc/cataloglinks.coffee
+++ b/src/features/misc/cataloglinks.coffee
@ -2,28 +2,33 @@ CatalogLinks =
  init: ->
    $.ready @ready 
    return unless Conf['Catalog Links']
-    el = $.el 'a',
+    el = $.el 'label',
      id:           'toggleCatalog'
      href:         'javascript:;'
-      className:    if Conf['Header catalog links'] then 'disabled' else ''
-      textContent:  'Catalog'
+      innerHTML:    "<input type=checkbox #{if Conf['Header catalog links'] then 'checked' else ''}>Catalog"
      title:        "Turn catalog links #{if Conf['Header catalog links'] then 'off' else 'on'}."
-    $.on el, 'click', @toggle

-    Header.addShortcut el
+    input = $ 'input', el
+    $.on input, 'change', @toggle
+    $.sync 'Header catalog links', CatalogLinks.set

-    $.asap (-> d.body), ->
-      return unless Main.isThisPageLegit()
-      # Wait for #boardNavMobile instead of #boardNavDesktop,
-      # it might be incomplete otherwise.
-      $.asap (-> $.id 'boardNavMobile'), ->
-        # Set links on load.
-        CatalogLinks.toggle.call el
+    $.event 'AddMenuEntry',
+      type:  'header'
+      el:    el
+      order: 95
+
+    $.on d, '4chanXInitFinished', ->
+      # Set links on load.
+      CatalogLinks.set Conf['Header catalog links']

  toggle: ->
-    $.set 'Header catalog links', useCatalog = @className is 'disabled'
-    $.toggleClass @, 'disabled'
-    for a in $$ 'a', $.id('boardNavDesktop')
+    $.event 'CloseMenu'
+    $.set 'Header catalog links', useCatalog = @checked
+    CatalogLinks.set useCatalog
+
+  set: (useCatalog) ->
+    path = if useCatalog then 'catalog' else ''
+    for a in $$ 'a', $.id('board-list')
      board = a.pathname.split('/')[1]
      continue if ['f', 'status', '4chan'].contains(board) or !board
      if Conf['External Catalog']
@ -32,9 +37,9 @@ CatalogLinks =
        else
          "//boards.4chan.org/#{board}/"
      else
-        a.pathname = "/#{board}/#{if useCatalog then 'catalog' else ''}"
+        a.pathname = "/#{board}/#{path}"
      a.title = if useCatalog then "#{a.title} - Catalog" else a.title.replace(/\ -\ Catalog$/, '')
-    @title       = "Turn catalog links #{if useCatalog then 'off' else 'on'}."
+    @title = "Turn catalog links #{if useCatalog then 'off' else 'on'}."

  external: (board) ->
    return (
@ -50,4 +55,4 @@ CatalogLinks =
    if catalogLink = ($('.pages.cataloglink a', d.body) or $ '[href=".././catalog"]', d.body)
      if g.VIEW isnt 'thread'
        $.add d.body, catalogLink
-      catalogLink.id = 'catalog'
+      catalogLink.id = 'catalog'
--- a/src/features/misc/expandcomment.coffee
+++ b/src/features/misc/expandcomment.coffee
--- a/src/features/misc/expandthread.coffee
+++ b/src/features/misc/expandthread.coffee
@ -94,8 +94,4 @@ ExpandThread =
    Main.callbackNodes Post, posts
    $.after a, nodes

-    # Enable 4chan features.
-    if Conf['Enable 4chan\'s Extension']
-      $.globalEval "Parser.parseThread(#{thread.ID}, 1, #{nodes.length})"
-    else
-      Fourchan.parseThread thread.ID, 1, nodes.length
+    Fourchan.parseThread thread.ID, 1, nodes.length
--- a/src/features/misc/fileinfo.coffee
+++ b/src/features/misc/fileinfo.coffee
--- a/src/features/misc/fourchan.coffee
+++ b/src/features/misc/fourchan.coffee
--- a/src/features/misc/header.coffee
+++ b/src/features/misc/header.coffee
@ -5,34 +5,30 @@ Header =
      id:        'main-menu'

    @menu = new UI.Menu 'header'
-    $.on @menuButton, 'click',           @menuToggle
-    $.on @toggle,     'mousedown',       @toggleBarVisibility
-    $.on window,      'load hashchange', Header.hashScroll

-    @positionToggler = $.el 'span',
-      textContent: 'Header Position'
-      className:   'header-position-link'
+    headerToggler = $.el 'label',
+      innerHTML: '<input type=checkbox name="Header auto-hide"> Auto-hide header'
+
+    @headerToggler   = headerToggler.firstElementChild
+
+    $.on @menuButton,     'click',           @menuToggle
+    $.on window,          'load hashchange', Header.hashScroll
+    $.on @headerToggler,  'change',          @toggleBarVisibility

    {createSubEntry} = Header
    subEntries = []
    for setting in ['sticky top', 'sticky bottom', 'top', 'hide']
      subEntries.push createSubEntry setting

+    subEntries.push {el: headerToggler}
+
    $.event 'AddMenuEntry',
-      type:  'header'
-      el:    @positionToggler
-      order: 108
+      type: 'header'
+      el: $.el 'span',
+        textContent: 'Header'
+      order: 105
      subEntries: subEntries

-    @headerToggler = $.el 'label',
-      innerHTML: "<input type=checkbox #{if Conf['Header auto-hide'] then 'checked' else ''}> Auto-hide header"
-    $.on @headerToggler.firstElementChild, 'change', @toggleBarVisibility
-
-    $.event 'AddMenuEntry',
-      type:  'header'
-      el:    @headerToggler
-      order: 109
-
    $.on d, 'CreateNotification', @createNotification

    $.asap (-> d.body), ->
@ -56,7 +52,7 @@ Header =
  toggle: $.el 'div',
    id: 'toggle-header-bar'

-  createSubEntry: (setting)->
+  createSubEntry: (setting) ->
    label = $.el 'label',
      textContent: "#{setting}"

@ -66,15 +62,15 @@ Header =

  setBoardList: ->
    Header.nav = nav = $.id 'boardNavDesktop'
+    nav.id = 'header-bar'
    if a = $ "a[href*='/#{g.BOARD}/']", nav
      a.className = 'current'

-    fullBoardList = $.el 'span',
-      id:     'full-board-list'
-      hidden: true
+    boardList = $.el 'span',
+      id: 'board-list'

-    customBoardList = $.el 'span',
-      id:     'custom-board-list'
+    $.add boardList, fullBoardList = $.el 'span',
+      id: 'full-board-list'

    Header.setBarPosition.call textContent: "#{Conf['Boards Navigation']}"
    $.sync 'Boards Navigation', Header.changeBarPosition
@ -86,18 +82,25 @@ Header =
    $.add settings, Header.menuButton

    $.add fullBoardList, [nav.childNodes...]
-    $.add nav, [customBoardList, fullBoardList, Header.shortcuts, Header.bar, Header.toggle]
+    $.add nav, [boardList, Header.shortcuts, Header.bar, Header.toggle]

    if Conf['Custom Board Navigation']
+      fullBoardList.hidden = true
+      customBoardList = $.el 'span',
+        id: 'custom-board-list'
+      $.add boardList, customBoardList
+
      Header.generateBoardList Conf['boardnav']
      $.sync 'boardnav', Header.generateBoardList
+
      btn = $.el 'span',
        className: 'hide-board-list-button'
        innerHTML: '[<a href=javascript:;> - </a>]\u00A0'
      $.on btn, 'click', Header.toggleBoardList
+
      $.prepend fullBoardList, btn
+
    else
-      $.rm $ '#custom-board-list', nav
      fullBoardList.hidden = false

  generateBoardList: (text) ->
@ -105,7 +108,7 @@ Header =
    $.rmAll list
    return unless text
    as = $$('#full-board-list a', Header.nav)[0...-2] # ignore the Settings and Home links
-    nodes = text.match(/[\w@]+(-(all|title|full|index|catalog|text:"[^"]+"))*|[^\w@]+/g).map (t) ->
+    nodes = text.match(/[\w@]+(-(all|title|replace|full|index|catalog|text:"[^"]+"))*|[^\w@]+/g).map (t) ->
      if /^[^\w@]/.test t
        return $.tn t
      if /^toggle-all/.test t
@ -124,6 +127,9 @@ Header =
          a = a.cloneNode true
          if /-title/.test t
            a.textContent = a.title
+          else if /-replace/.test t
+            if $.hasClass a, 'current'
+              a.textContent = a.title
          else if /-full/.test t
            a.textContent = "/#{board}/ - #{a.title}"
          else if /-(index|catalog|text)/.test t
@ -173,7 +179,8 @@ Header =
        $.addClass doc, 'hide'

  setBarVisibility: (hide) ->
-    Header.headerToggler.firstElementChild.checked = hide
+    Header.headerToggler.checked = hide
+    $.event 'CloseMenu'
    (if hide then $.addClass else $.rmClass) Header.nav, 'autohide'

  hashScroll: ->
@ -193,20 +200,33 @@ Header =
    hide = if @nodeName is 'INPUT'
      @checked
    else
-      !$.hasClass Header.nav, 'autohide'
+      !$.hasClass Header.bar, 'autohide'
+    Conf['Header auto-hide'] = hide
+    $.set 'Header auto-hide', hide
    Header.setBarVisibility hide
    message = if hide
      'The header bar will automatically hide itself.'
    else
      'The header bar will remain visible.'
    new Notification 'info', message, 2
-    $.set 'Header auto-hide', hide
+
+  hashScroll: ->
+    return unless (hash = @location.hash) and post = $.id hash[1..]
+    return if (Get.postFromRoot post).isHidden
+    Header.scrollToPost post
+
+  scrollToPost: (post) ->
+    {top} = post.getBoundingClientRect()
+    if Conf['Boards Navigation'] is 'sticky top'
+      headRect = Header.bar.getBoundingClientRect()
+      top += - headRect.top - headRect.height
+    <% if (type === 'crx') { %>d.body<% } else { %>doc<% } %>.scrollTop += top

  addShortcut: (el) ->
    shortcut = $.el 'span',
      className: 'shortcut'
    $.add shortcut, [$.tn(' ['), el, $.tn(']')]
-    $.add Header.shortcuts, shortcut
+    $.prepend Header.shortcuts, shortcut

  menuToggle: (e) ->
    Header.menu.toggle e, @, g
--- a/src/features/misc/keybinds.coffee
+++ b/src/features/misc/keybinds.coffee
@ -133,8 +133,10 @@ Keybinds =
    do QR.open
    if quote
      QR.quote.call $ 'input', $('.post.highlight', thread) or thread
+
    do QR.nodes.com.focus
-    $.rmClass $('.qr-shortcut'), 'disabled'
+    if Conf['QR Shortcut']
+      $.rmClass $('.qr-shortcut'), 'disabled'

  tags: (tag, ta) ->
    value    = ta.value
--- a/src/features/misc/redirection.coffee
+++ b/src/features/misc/redirection.coffee
@ -0,0 +1,133 @@
+Redirect =
+  init: ->
+    $.sync 'archs', @updateArchives
+
+  updateArchives: ->
+    $.get 'archivers', {}, ({archivers}) ->
+      Conf['archivers'] = archivers
+
+  image: (boardID, filename) ->
+    # Do not use g.BOARD, the image url can originate from a cross-quote.
+    switch boardID
+      when 'a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'
+        "//archive.foolz.us/#{boardID}/full_image/#{filename}"
+      when 'u'
+        "//nsfw.foolz.us/#{boardID}/full_image/#{filename}"
+      when 'po'
+        "//archive.thedarkcave.org/#{boardID}/full_image/#{filename}"
+      when 'hr', 'tv'
+        "http://archive.4plebs.org/#{boardID}/full_image/#{filename}"
+      when 'ck', 'fa', 'lit', 's4s'
+        "//fuuka.warosu.org/#{boardID}/full_image/#{filename}"
+      when 'cgl', 'g', 'mu', 'w'
+        "//rbt.asia/#{boardID}/full_image/#{filename}"
+      when 'an', 'k', 'toy', 'x'
+        "http://archive.heinessen.com/#{boardID}/full_image/#{filename}"
+      when 'c'
+        "//archive.nyafuu.org/#{boardID}/full_image/#{filename}"
+
+  post: (boardID, postID) ->
+    unless Redirect.post[boardID]?
+      for name, archive of @archiver
+        if archive.type is 'foolfuuka' and archive.boards.contains boardID
+          Redirect.post[boardID] = archive.base
+          break
+      Redirect.post[boardID] or= false
+
+    return if Redirect.post[boardID]
+      "#{Redirect.post[boardID]}/_/api/chan/post/?board=#{boardID}&num=#{postID}"
+    else
+      null
+
+  select: (board) ->
+    for name, archive of @archiver
+      continue unless archive.boards.contains board
+      name
+
+  to: (data) ->
+    {boardID} = data
+
+    unless (arch = Conf.archivers[boardID])?
+      Conf.archivers[boardID] = arch = @select(boardID)[0]
+      $.set 'archivers', Conf.archivers
+
+    return (if arch and archive = @archiver[arch]
+      Redirect.path archive.base, archive.type, data
+    else if data.threadID
+      "//boards.4chan.org/#{boardID}/"
+    else
+      null)
+
+  archiver:
+    'Foolz':
+      base:   'https://archive.foolz.us'
+      boards: ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg']
+      type:   'foolfuuka'
+    'NSFWFoolz':
+      base:   'https://nsfw.foolz.us'
+      boards: ['u']
+      type:   'foolfuuka'
+    'TheDarkCave':
+      base:   'http://archive.thedarkcave.org'
+      boards: ['c', 'int', 'out', 'po']
+      type:   'foolfuuka'
+    '4plebs':
+      base:   'http://archive.4plebs.org'
+      boards: ['hr', 'tg', 'tv', 'x']
+      base:   'foolfuuka'
+    'Warosu':
+      base:   '//fuuka.warosu.org'
+      boards: ['cgl', 'ck', 'fa', 'jp', 'lit', 's4s', 'q', 'tg']
+      type:   'fuuka'
+    'RebeccaBlackTech':
+      base:   '//rbt.asia'
+      boards: ['an', 'cgl', 'g', 'mu', 'w']
+      type:   'fuuka_mail'
+    'InstallGentoo':
+      base:   '//archive.installgentoo.net'
+      boards: ['diy', 'g', 'sci']
+      type:   'fuuka'
+    'Heinessen':
+      base:   'http://archive.heinessen.com'
+      boards: ['an', 'fit', 'k', 'mlp', 'r9k', 'toy', 'x']
+      type:   'fuuka'
+    'Cliche':
+      base:   '//www.cliché.net/4chan/cgi-board.pl'
+      boards: ['e']
+      type:   'fuuka'
+    'NyaFuu':
+      base:   '//archive.nyafuu.org'
+      boards: ['c', 'w']
+      type:   'fuuka'
+
+  path: (base, archiver, data) ->
+    if data.isSearch
+      {boardID, type, value} = data
+      type = if type is 'name'
+        'username'
+      else if type is 'MD5'
+        'image'
+      else
+        type
+      value = encodeURIComponent value
+      return if archiver is 'foolfuuka'
+        "#{base}/#{boardID}/search/#{type}/#{value}"
+      else if type is 'image'
+        "#{base}/#{boardID}/?task=search2&search_media_hash=#{value}"
+      else
+        "#{base}/#{boardID}/?task=search2&search_#{type}=#{value}"
+
+    {boardID, threadID, postID} = data
+    # keep the number only if the location.hash was sent f.e.
+    path = if threadID
+      "#{boardID}/thread/#{threadID}"
+    else
+      "#{boardID}/post/#{postID}"
+    if archiver is 'foolfuuka'
+      path += '/'
+    if threadID and postID
+      path += if archiver is 'foolfuuka'
+        "##{postID}"
+      else
+        "#p#{postID}"
+    "#{base}/#{path}"
--- a/src/features/misc/relativedates.coffee
+++ b/src/features/misc/relativedates.coffee
--- a/src/features/misc/report.coffee
+++ b/src/features/misc/report.coffee
--- a/src/features/misc/rtnavigation.coffee
+++ b/src/features/misc/rtnavigation.coffee
--- a/src/features/misc/sauce.coffee
+++ b/src/features/misc/sauce.coffee
--- a/src/features/misc/timeformatting.coffee
+++ b/src/features/misc/timeformatting.coffee
--- a/src/features/monitoring/favicon.coffee
+++ b/src/features/monitoring/favicon.coffee
--- a/src/features/monitoring/threadexcerpt.coffee
+++ b/src/features/monitoring/threadexcerpt.coffee
@ -6,7 +6,4 @@ ThreadExcerpt =
      name: 'Thread Excerpt'
      cb:   @node
  node: ->
-    d.title = if (excerpt = Get.threadExcerpt @).length > 80
-      "#{excerpt[...77]}..."
-    else
-      excerpt
+    d.title = Get.threadExcerpt @
--- a/src/features/monitoring/threadstats.coffee
+++ b/src/features/monitoring/threadstats.coffee
--- a/src/features/monitoring/threadupdater.coffee
+++ b/src/features/monitoring/threadupdater.coffee
@ -290,10 +290,7 @@ ThreadUpdater =
        # Enable 4chan features.
        threadID = ThreadUpdater.thread.ID
        {length} = $$ '.thread > .postContainer', ThreadUpdater.root
-        if Conf['Enable 4chan\'s Extension']
-          $.globalEval "Parser.parseThread(#{threadID}, #{-count})"
-        else
-          Fourchan.parseThread threadID, length - count, length
+        Fourchan.parseThread threadID, length - count, length

    $.event 'ThreadUpdate',
      404: false
--- a/src/features/monitoring/threadwatcher.coffee
+++ b/src/features/monitoring/threadwatcher.coffee
--- a/src/features/monitoring/unread.coffee
+++ b/src/features/monitoring/unread.coffee
@ -26,18 +26,22 @@ Unread =
    $.on d, 'ThreadUpdate',            Unread.onUpdate
    $.on d, 'scroll visibilitychange', Unread.read
    $.on d, 'visibilitychange',        Unread.setLine if Conf['Unread Line']
+    if Conf['Scroll to Last Read Post']
+      $.on window, 'load', (posts) =>
+        Unread.scroll.apply @, posts

-    return unless Conf['Scroll to Last Read Post']
+  scroll: (posts) ->
    # Let the header's onload callback handle it.
    return if (hash = location.hash.match /\d+/) and hash[0] of @posts
    if Unread.posts.length
      # Scroll to before the first unread post.
      while root = $.x 'preceding-sibling::div[contains(@class,"postContainer")][1]', Unread.posts[0].nodes.root
        break unless (Get.postFromRoot root).isHidden
+      return unless root
      root.scrollIntoView false
    else if posts.length
      # Scroll to the last read post.
-      Header.scrollToPost posts[posts.length - 1].nodes.root
+      Header.scrollToPost (posts[post.length - 1]).nodes.root

  sync: ->
    lastReadPost = Unread.db.get
@ -98,7 +102,7 @@ Unread =
      break if post.ID > Unread.lastReadPost
    arr.splice 0, i

-  read: (e) ->
+  read: $.debounce 50, (e) ->
    return if d.hidden or !Unread.posts.length
    height  = doc.clientHeight
    {posts} = Unread
@ -106,8 +110,8 @@ Unread =
    i = posts.length

    while post = posts[--i]
-      {bottom, top} = post.nodes.root.getBoundingClientRect()
-      if (bottom < height) and (top > 0)  # post is completely read
+      {bottom} = post.nodes.root.getBoundingClientRect()
+      if (bottom < height)  # post is completely read
        ID = post.ID
        posts.remove post
    return unless ID
@ -136,10 +140,7 @@ Unread =
    count = Unread.posts.length

    if Conf['Unread Count']
-      d.title = if g.DEAD
-        "(#{Unread.posts.length}) /#{g.BOARD}/ - 404"
-      else
-        "(#{Unread.posts.length}) #{Unread.title}"
+      d.title = "#{if count or !Conf['Hide Unread Count at (0)'] then "(#{count}) " else ''}#{if g.DEAD then "/#{g.BOARD}/ - 404" else "#{Unread.title}"}" 
      <% if (type === 'crx') { %>
      # XXX Chrome bug where it doesn't always update the tab title.
      # crbug.com/124381
--- a/src/features/posting/qr.coffee
+++ b/src/features/posting/qr.coffee
@ -81,7 +81,8 @@ QR =
    QR.cleanNotifications()
    d.activeElement.blur()
    $.rmClass QR.nodes.el, 'dump'
-    $.toggleClass $('.qr-shortcut'), 'disabled'
+    if Conf['QR Shortcut']
+      $.toggleClass $('.qr-shortcut'), 'disabled'
    for i in QR.posts
      QR.posts[0].rm()
    QR.cooldown.auto = false
@ -303,7 +304,8 @@ QR =
    QR.selected.save com
    QR.selected.save thread

-    $.rmClass $('.qr-shortcut'), 'disabled'
+    if Conf['QR Shortcut']
+      $.rmClass $('.qr-shortcut'), 'disabled'

  characterCount: ->
    counter = QR.nodes.charCount
@ -850,7 +852,7 @@ QR =
    QR.mimeTypes = mimeTypes.split ', '
    # Add empty mimeType to avoid errors with URLs selected in Window's file dialog.
    QR.mimeTypes.push ''
-    nodes.fileInput.max    = $('input[name=MAX_FILE_SIZE]').value
+    nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value
    <% if (type !== 'userjs') { %>
    # Opera's accept attribute is fucked up
    nodes.fileInput.accept = "text/*, #{mimeTypes}"
@ -887,8 +889,8 @@ QR =
      $.on elm, 'blur',  QR.focusout
      $.on elm, 'focus', QR.focusin
    <% } %>
-    $.on QR.nodes.el, 'focusin',  QR.focusin
-    $.on QR.nodes.el, 'focusout', QR.focusout
+    $.on dialog,           'focusin',  QR.focusin
+    $.on dialog,           'focusout', QR.focusout
    $.on nodes.autohide,   'change', QR.toggleHide
    $.on nodes.close,      'click',  QR.close
    $.on nodes.dumpButton, 'click',  -> nodes.el.classList.toggle 'dump'
--- a/src/features/quoting/quotebacklinks.coffee
+++ b/src/features/quoting/quotebacklinks.coffee
--- a/src/features/quoting/quotecrossthread.coffee
+++ b/src/features/quoting/quotecrossthread.coffee
--- a/src/features/quoting/quoteinline.coffee
+++ b/src/features/quoting/quoteinline.coffee
--- a/src/features/quoting/quoteop.coffee
+++ b/src/features/quoting/quoteop.coffee
--- a/src/features/quoting/quotepreview.coffee
+++ b/src/features/quoting/quotepreview.coffee
--- a/src/features/quoting/quotethreading.coffee
+++ b/src/features/quoting/quotethreading.coffee
@ -72,22 +72,23 @@ QuoteThreading =
      return false unless Unread.posts.contains(qpost) or ((bottom < height) and (top > 0))

    qroot = qpost.nodes.root
-    threadContainer = qroot.nextSibling
-    if threadContainer?.className isnt 'threadContainer'
+    unless $.hasClass qroot, 'threadOP'
+      $.addClass qroot, 'threadOP'
      threadContainer = $.el 'div',
        className: 'threadContainer'
      $.after qroot, threadContainer
+    else
+      threadContainer = qroot.nextSibling

    $.add threadContainer, @nodes.root
    return true

  toggle: ->
-    thread = $ '.thread'
+    thread  = $ '.thread'
    replies = $$ '.thread > .replyContainer, .threadContainer > .replyContainer', thread
    QuoteThreading.enabled = @checked
    if @checked
      nodes = (Get.postFromNode reply for reply in replies)
-      Unread.node.call    node for node in nodes
      QuoteThreading.node node for node in nodes
    else
      replies.sort (a, b) ->
@ -98,6 +99,7 @@ QuoteThreading =
      containers = $$ '.threadContainer', thread
      $.rm container for container in containers
      Unread.update true
+    return

  kb: ->
      control = $.id 'threadingControl'
--- a/src/features/quoting/quoteyou.coffee
+++ b/src/features/quoting/quoteyou.coffee
--- a/src/features/quoting/quotify.coffee
+++ b/src/features/quoting/quotify.coffee
--- a/src/features/theming/banner.coffee
+++ b/src/features/theming/banner.coffee
--- a/src/features/theming/customcss.coffee
+++ b/src/features/theming/customcss.coffee
--- a/src/features/theming/emoji.coffee
+++ b/src/features/theming/emoji.coffee
--- a/src/features/theming/globalmessage.coffee
+++ b/src/features/theming/globalmessage.coffee
--- a/src/features/theming/jscolor.coffee
+++ b/src/features/theming/jscolor.coffee
--- a/src/features/theming/mascots.coffee
+++ b/src/features/theming/mascots.coffee
--- a/src/features/theming/rice.coffee
+++ b/src/features/theming/rice.coffee
--- a/src/features/theming/style.coffee
+++ b/src/features/theming/style.coffee
--- a/src/features/theming/themes.coffee
+++ b/src/features/theming/themes.coffee
--- a/src/code/globals.coffee
+++ b/src/code/globals.coffee
--- a/src/lib/get.coffee
+++ b/src/lib/get.coffee
@ -5,6 +5,8 @@ Get =
      OP.info.comment.replace(/\n+/g, ' // ') or
      Conf['Anonymize'] and 'Anonymous' or
      $('.nameBlock', OP.nodes.info).textContent.trim()
+    if excerpt.length > 70
+      excerpt = "#{excerpt[...67]}..." 
    "/#{thread.board}/ - #{excerpt}"
  postFromRoot: (root) ->
    link    = $ 'a[title="Highlight this post"]', root
--- a/src/lib/ui.coffee
+++ b/src/lib/ui.coffee
@ -54,14 +54,13 @@ UI = do ->
      menu = @makeMenu()
      currentMenu       = menu
      lastToggledButton = button
+      
+      @entries.sort (first, second) ->
+        first.order - second.order

      for entry in @entries
        @insertEntry entry, menu, data

-      entry = $ '.entry', menu
-      while prevEntry = @findNextEntry entry, -1
-        entry = prevEntry
-      @focus entry
      $.on d, 'click',     @close
      $.on d, 'CloseMenu', @close
      Rice.nodes menu
@ -87,6 +86,14 @@ UI = do ->
      style.right  = "#{right}px"
      style.bottom = "#{bottom}px"
      style.left   = "#{left}px"
+      if right
+        $.addClass menu, 'left'
+
+      entry = $ '.entry', menu
+      # We've removed flexbox, so we don't user order anymore.
+      # while prevEntry = @findNextEntry entry, -1
+      #   entry = prevEntry
+      @focus entry

      menu.focus()

--- a/src/code/main.coffee
+++ b/src/code/main.coffee
@ -14,7 +14,6 @@ Main =
    flatten null, Config
    for db in DataBoards
      Conf[db] = boards: {}
-      
    # Unflattened Config.
    $.extend Conf,
      'userThemes':           []
@ -24,6 +23,7 @@ Main =
      'Enabled Mascots nsfw': []
      'Deleted Mascots':      []
      'Hidden Categories':    ["Questionable"]
+      'archivers':            {}

    $.get Conf, Main.initFeatures

@ -93,6 +93,7 @@ Main =
      'Rice':                     Rice
      'Banner':                   Banner
      'Announcements':            GlobalMessage
+      'Redirection':              Redirect
      'Header':                   Header
      'Catalog Links':            CatalogLinks
      'Settings':                 Settings
@ -125,6 +126,7 @@ Main =
      'Time Formatting':          Time
      'Relative Post Dates':      RelativeDates
      'File Info Formatting':     FileInfo
+      'Fappe Tyme':               FappeTyme
      'Sauce':                    Sauce
      'Image Expansion':          ImageExpand
      'Image Expansion (Menu)':   ImageExpand.menu
--- a/src/code/settings.coffee
+++ b/src/code/settings.coffee
@ -7,6 +7,7 @@ Settings =
      href:        'javascript:;'
    $.on link, 'click', Settings.open

+
    $.asap (-> d.body), ->
      return unless Main.isThisPageLegit()
      # Wait for #boardNavMobile instead of #boardNavDesktop,
@ -41,10 +42,10 @@ Settings =
    Settings.addSection 'Sauce',    Settings.sauce
    Settings.addSection 'Rice',     Settings.rice
    Settings.addSection 'Keybinds', Settings.keybinds
+
    $.on d, 'AddSettingsSection',   Settings.addSection
    $.on d, 'OpenSettings',         (e) -> Settings.open e.detail

-    return if Conf['Enable 4chan\'s Extension']
    settings = JSON.parse(localStorage.getItem '4chan-settings') or {}
    return if settings.disableAll
    settings.disableAll = true
@ -73,7 +74,7 @@ Settings =
          <div class=credits>
            <a href='<%= meta.page %>' target=_blank><%= meta.name %></a> |
            <a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md' target=_blank>#{g.VERSION}</a> |
-            <a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/CONTRIBUTING.md#reporting-bugs' target=_blank>Issues</a> |
+            <a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/CONTRIBUTING.md#reporting-bugs-and-suggestions' target=_blank>Issues</a> |
            <a href=javascript:; class=close title=Close>×</a>
          </div>
        </nav>
@ -403,6 +404,11 @@ Settings =

  rice: (section) ->
    section.innerHTML = """
+      <fieldset>
+        <legend>Archiver</legend>
+        Select an Archiver for this board:
+        <select name=archiver></select>
+      </fieldset>
      <fieldset>
        <legend>Custom Board Navigation <span class=warning #{if Conf['Custom Board Navigation'] then 'hidden' else ''}>is disabled.</span></legend>
        <div><input name=boardnav class=field spellcheck=false></div>
@ -416,6 +422,7 @@ Settings =
        </div>
        <div>Board link: <code>board</code></div>
        <div>Title link: <code>board-title</code></div>
+        <div>Board link (Replace with title when on that board): <code>board-replace</code></div>
        <div>Full text link: <code>board-full</code></div>
        <div>Custom text link: <code>board-text:"VIP Board"</code></div>
        <div>Index-only link: <code>board-index</code></div>
@ -479,6 +486,21 @@ Settings =
      else
        'input'
      $.on input, event, $.cb.value
+
+    # Archiver
+    archiver = $ 'select[name=archiver]', section
+    toSelect = Redirect.select g.BOARD.ID
+    toSelect = ['No Archive Available'] unless toSelect[0]
+
+    $.add archiver, $.el('option', {textContent: name}) for name in toSelect
+
+    if toSelect[1]
+      Conf['archivers'][g.BOARD]
+      archiver.value = Conf['archivers'][g.BOARD] or toSelect[0]
+      $.on archiver, 'change', ->
+        Conf['archivers'][g.BOARD] = @value
+        $.set 'archivers', Conf.archivers
+
    $.get items, (items) ->
      for key, val of items
        input = inputs[key]
@ -1096,4 +1118,4 @@ Settings =
            userThemes = item["userThemes"]
            userThemes[@id] = Themes[@id]
            $.set 'userThemes', userThemes
-            $.rm @
+            $.rm @