Add option to automaticly change image hash

.gitignore

@@ -13,3 +13,4 @@ node_modules/
 /.events2
 /dist/
 /builds/*.gz
+/test/

.travis.yml

@@ -0,0 +1,7 @@
+dist: xenial
+language: generic
+install: npm install
+script: make
+branches:
+  only:
+    - master

CONTRIBUTING.md

@@ -2,24 +2,26 @@
 
 Bug reports and feature requests for 4chan X are tracked at **https://github.com/ccd0/4chan-x/issues?q=is%3Aopen+sort%3Aupdated-desc**.
 
-You can submit a bug report / feature request either via your Github account or the [anonymous report form](https://gitreports.com/issue/ccd0/4chan-x).
+You can submit a bug report / feature request via your Github account.
 
 If you're reporting a bug, the more detail you can give, the better. If I can't reproduce your bug, I probably won't be able to fix it. You can help by doing the following:
 
 1. Include precise steps to reproduce the problem, with the expected and actual results.
-2. **Please mention any other extensions / scripts you are using.** To check if a bug is due to a conflict with another extension, temporarily disable any other extensions and userscripts. If the bug goes away, turn them back on one by one until you find the one causing the problem.
-3. Make sure your **browser**, **4chan X**, and (if applicable) **Greasemonkey** are up to date. Include the versions you're using in bug reports.
-4. Test if the bug occurs with 4chan X disabled and using the native extension. If it does, it's likely a problem with 4chan or your browser rather than with 4chan X.
-5. Open your console with Shift+Control+J (⇧⌘J on OS X Firefox, ⌘⌥J on OS X Chromium), and look for any error messages, especially ones that occur at the same time as the bug. Include these in your bug report. If you're using Firefox, be sure to check the browser console (Shift+Control+J), not the web console (Shift+Control+K) as errors may not show up in the latter.
+2. Make sure your browser, 4chan X, and userscript manager (e.g. Greasemonkey, ViolentMoney, or Tampermonkey) are up to date. **Include the versions you're using in bug reports.**
+3. Open your console with Shift+Control+J (⇧⌘J on OS X Firefox, ⌘⌥J on OS X Chromium), and **look for error messages**, especially ones that occur at the same time as the bug. Include these in your bug report. If you're using Firefox, be sure to check the browser console (Shift+Control+J), not just the web console (Shift+Control+K) as errors may not show up in the latter. Messages about "Content Security Policy" are expected and can be ignored.
+4. If other people (including me) aren't having your problem, **test whether it happens in a fresh profile**. Here are instructions for [Firefox](https://support.mozilla.org/en-US/kb/profile-manager-create-and-remove-firefox-profiles) and [Chromium](https://developer.chrome.com/devtools/docs/clean-testing-environment).
+5. **Please mention any other extensions / scripts you are using.** To check if a bug is due to a conflict with another extension, temporarily disable any other extensions and userscripts. If the bug goes away, turn them back on one by one until you find the one causing the problem.
 6. To test if the bug occurs under the default settings or only with specific settings, back up your settings and reset them using the **Export** and **Reset Settings** links in the settings panel. If the bug only occurs under specific settings, upload your exported settings to a site like https://paste.installgentoo.com/, and link to it in your bug report. If your settings contains sensitive information (e.g. personas), edit the text file manually.
+7. Test if the bug occurs using the **native extension** with 4chan X disabled. If it does, it's likely a problem with 4chan or your browser rather than with 4chan X.
 
 ## Development & Contribution
 
 ### Get started
 
-- Install [git](https://git-scm.com/), [node.js](https://nodejs.org/), and [npm](https://www.npmjs.com/) (usually distributed with node), and GNU Make (on Windows, the [MinGW](http://www.mingw.org/) port will work).
+- Install [git](https://git-scm.com/), [node.js](https://nodejs.org/), [npm](https://www.npmjs.com/) (usually distributed with node), and GNU Make (on Windows, the [MinGW](http://www.mingw.org/) port will work, and the [GnuWin](http://gnuwin32.sourceforge.net/) port has been reported to work as well).
 - Clone 4chan X: `git clone https://github.com/ccd0/4chan-x.git`<br>(If this is taking too long, you can add `--depth 100` to fetch only recent history.)
 - Open the directory: `cd 4chan-x`
+- Fetch needed dependencies with: `npm install`
 
 ### Build
 
@@ -29,16 +31,18 @@ If you're reporting a bug, the more detail you can give, the better. If I can't
 
 - 4chan X is mostly written in [CoffeeScript](http://coffeescript.org/). If you're already familiar with Javascript, it doesn't take long to pick up.
 - Edit the sources in the src/ directory (not the compiled scripts in builds/).
-- Compile the script with: `grunt`
+- Fetch needed dependencies with: `npm install`
+- Compile the script with: `make`
 - Install the compiled script (found in the testbuilds/ directory), and test your changes.
 - Make sure you have set your name and email as you want them, as they will be published in your commit message:<br>`git config user.name yourname`<br>`git config user.email youremail`
 - Commit your changes: `git commit -a`
 - Open a pull request by doing any of the following:
   - Fork this repository on Github, push your changes to your fork, and make a pull request through the Github website.
-  - Push your changes to any online Git repository, and [open an issue](https://gitreports.com/issue/ccd0/4chan-x) with an explanation of your changes and the URL, branch, and commit you want me to pull from.
-  - Export your changes via `git bundle` (e.g. `git bundle create file.bundle master..your-branch`), and upload them to a file host like https://jii.moe/. Then [open an issue](https://gitreports.com/issue/ccd0/4chan-x) with an explanation of your changes and the URL of the file.
+  - Push your changes to any online Git repository, and send an email with an explanation of your changes and the URL, branch, and commit you want me to pull from.
+  - Export your changes via `git bundle` (e.g. `git bundle create file.bundle master..your-branch`), and upload them to a file host. Then send an email with an explanation of your changes and the URL of the file.
 
-Archive list updates should go to https://github.com/MayhemYDG/archives.json.
+Pull requests to archive.json should be sent upstream: https://github.com/4chenz/archives.json
+4chan X updates from there automatically.
 
 ### More info
 

Makefile

@@ -2,7 +2,7 @@ ifdef ComSpec
   BIN := $(subst /,\,node_modules/.bin/)
   RMDIR := -rmdir /s /q
   RM := -del
-  CAT = type $(subst /,\,$1) > $(subst /,\,$2)
+  CAT = type $(subst /,\,$1) > $(subst /,\,$2) 2>NUL
   MKDIR = -mkdir $(subst /,\,$@)
   QUOTE = $(patsubst %,"%",$1)
 else
@@ -15,24 +15,23 @@ else
 endif
 CP = $(call CAT,$<,$@)
 
-npgoals := clean cleanrel cleanweb cleanfull withtests wrapped $(foreach i,1 2 3 4,bump$(i)) tag tagcommit beta stable web update updatehard
+npgoals := clean cleanrel cleanweb cleanfull withtests archives $(foreach i,1 2 3 4,bump$(i)) tag tagcommit beta stable web update updatehard
 ifneq "$(filter $(npgoals),$(MAKECMDGOALS))" ""
 .NOTPARALLEL :
 endif
 
 coffee := $(BIN)coffee -c --no-header
-coffee_deps := node_modules/coffee-script/package.json
 template := node tools/template.js
-template_deps := package.json tools/template.js node_modules/lodash.template/package.json node_modules/esprima/package.json
+template_deps := package.json tools/template.js
 
-# read name meta_name meta_distBranch meta_uploadPath
+# read name meta_name meta_distBranch
 $(eval $(shell node tools/pkgvars.js))
 
 # must be read in when needed to prevent out-of-date version
 version = $(shell node -p "JSON.parse(require('fs').readFileSync('version.json')).version")
 
 source_directories := \
- globals config css platform classes \
+ globals config css platform classes site \
  Archive Filtering General Images Linkification \
  Menu Miscellaneous Monitoring Posting Quotelinks \
  main
@@ -46,16 +45,14 @@ sources := $(foreach d,$(source_directories),$(call sort_directory,$(d)))
 
 uses_tests_enabled := \
  src/classes/Post.coffee \
- src/General/Build.Test.coffee \
+ src/General/Test.coffee \
  src/Linkification/Linkify.coffee \
- src/Miscellaneous/Keybinds.coffee \
- src/Monitoring/Unread.coffee \
  src/main/Main.coffee
 
 imports_src/globals/globals.js := \
  version.json
 imports_src/css/CSS.js := \
- node_modules/font-awesome/package.json
+ node_modules/font-awesome/fonts/fontawesome-webfont.woff
 imports_src/Monitoring/Favicon.coffee := \
  src/meta/icon128.png
 
@@ -87,7 +84,7 @@ crx_contents := script.js eventPage.js icon16.png icon48.png icon128.png manifes
 
 release := \
  $(foreach f, \
-  $(foreach c,. -beta.,$(name)$(c)crx updates$(c)xml $(name)$(c)user.js $(name)$(c)meta.js) \
+  $(foreach c,. -beta.,$(name)$(c)crx updates$(c)xml updates$(c)json $(name)$(c)user.js $(name)$(c)meta.js) \
   $(name)-noupdate.crx \
   $(name)-noupdate.user.js \
   $(name).zip \
@@ -104,22 +101,6 @@ all : default release
 .events .events2 tmp testbuilds builds :
 	$(MKDIR)
 
-ifneq "$(wildcard npm-shrinkwrap.json)" ""
-
-.events/npm : npm-shrinkwrap.json | .events
-	npm install
-	echo -> $@
-
-node_modules/%/package.json : .events/npm
-	$(if $(wildcard $@),,npm install && echo -> $<)
-
-else
-
-node_modules/%/package.json :
-	npm install $*
-
-endif
-
 .tests_enabled :
 	echo false> .tests_enabled
 
@@ -137,7 +118,7 @@ endef
 
 $(foreach s,$(sources),$(eval $(call check_source,$(subst $$,$$$$,$(s)))))
 
-.events/compile : $(updates) $(template_deps) $(coffee_deps) tools/chain.js
+.events/compile : $(updates) $(template_deps) tools/chain.js
 	node tools/chain.js $(call QUOTE, \
 	  $(subst .events/,tmp/, \
 	   $(if $(filter-out $(updates),$?), \
@@ -150,11 +131,11 @@ $(foreach s,$(sources),$(eval $(call check_source,$(subst $$,$$$$,$(s)))))
 
 $(dests) : .events/compile
 	$(if $(wildcard $@),, \
-	 node tools/chain.js $(filter-out $(wildcard $(dests)),$(dests)) \
+	 node tools/chain.js $(call QUOTE, $(filter-out $(wildcard $(dests)),$(dests))) \
 	 && echo -> $< \
 	)
 
-tmp/eventPage.js : src/meta/eventPage.coffee $(coffee_deps) | tmp
+tmp/eventPage.js : src/meta/eventPage.coffee | tmp
 	$(coffee) -o tmp src/meta/eventPage.coffee
 
 tmp/LICENSE : LICENSE tools/newlinefix.js | tmp
@@ -169,7 +150,8 @@ testbuilds/crx$1 :
 	$$(MKDIR)
 
 testbuilds/crx$1/script.js : $$(call pieces,crx) | testbuilds/crx$1 .events/compile
-	$$(call CAT,$$(call QUOTE,$$(call pieces,crx)),$$@)
+	@echo Concatenating: $$@
+	@$$(call CAT,$$(call QUOTE,$$(call pieces,crx)),$$@)
 
 testbuilds/crx$1/eventPage.js : tmp/eventPage.js | testbuilds/crx$1
 	$$(CP)
@@ -183,19 +165,23 @@ testbuilds/crx$1/manifest.json : src/meta/manifest.json version.json $(template_
 testbuilds/updates$1.xml : src/meta/updates.xml version.json $(template_deps) | testbuilds/crx$1
 	$(template) $$< $$@ type=crx channel=$1
 
+testbuilds/updates$1.json : src/meta/updates.json version.json $(template_deps) | testbuilds/crx$1
+	$(template) $$< $$@ type=crx channel=$1
+
 testbuilds/$(name)$1.crx.zip : \
  $(foreach f,$(crx_contents),testbuilds/crx$1/$(f)) \
- package.json version.json tools/zip-crx.js node_modules/jszip/package.json
+ package.json version.json tools/zip-crx.js
 	node tools/zip-crx.js $1
 
-testbuilds/$(name)$1.crx : testbuilds/$(name)$1.crx.zip package.json tools/sign.js node_modules/crx/package.json
-	node tools/sign.js $1
+testbuilds/$(name)$1.crx : $(foreach f,$(crx_contents),testbuilds/crx$1/$(f)) version.json tools/sign.sh | tmp
+	tools/sign.sh $1
 
-testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png version.json $(template_deps) | testbuilds
+testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png version.json src/Archive/archives.json $(template_deps) | testbuilds
 	$(template) $$< $$@ type=userscript channel=$1
 
 testbuilds/$(name)$1.user.js : testbuilds/$(name)$1.meta.js tmp/meta-newline.js $$(call pieces,userscript) | .events/compile
-	$$(call CAT,testbuilds/$(name)$1.meta.js tmp/meta-newline.js $$(call QUOTE,$$(call pieces,userscript)),$$@)
+	@echo Concatenating: $$@
+	@$$(call CAT,testbuilds/$(name)$1.meta.js tmp/meta-newline.js $$(call QUOTE,$$(call pieces,userscript)),$$@)
 
 endef
 
@@ -209,7 +195,7 @@ testbuilds/$(name).zip : testbuilds/$(name)-noupdate.crx.zip
 builds/% : testbuilds/% | builds
 	$(CP)
 
-test.html : README.md template.jst tools/markdown.js node_modules/markdown-it/package.json node_modules/markdown-it-anchor/package.json node_modules/lodash.template/package.json
+test.html : README.md template.jst tools/markdown.js
 	node tools/markdown.js
 
 index.html : test.html
@@ -218,7 +204,7 @@ index.html : test.html
 tmp/.jshintrc : src/meta/jshint.json tmp/declaration.js src/globals/globals.js $(template_deps) | tmp
 	$(template) $< $@
 
-.events/jshint : $(dests) tmp/.jshintrc node_modules/jshint/package.json
+.events/jshint : $(dests) tmp/.jshintrc
 	$(BIN)jshint $(call QUOTE, \
 	 $(if $(filter-out $(dests),$?), \
 	  $(dests), \
@@ -234,7 +220,7 @@ install.json :
 	node tools/install.js
 	echo -> $@
 
-.events/CHANGELOG : version.json | .events node_modules/dateformat/package.json
+.events/CHANGELOG : version.json | .events
 	node tools/updcl.js
 	echo -> $@
 
@@ -258,13 +244,13 @@ distready : dist $(wildcard dist/* dist/*/*)
 	git push web $(meta_distBranch)
 	echo -> $@
 
-.events2/push-store : .git/refs/tags/stable | .events2 distready node_modules/webstore-upload/package.json
+.events2/push-store : .git/refs/tags/stable | .events2 distready
 	node tools/webstore.js
 	echo -> $@
 
 .SECONDARY :
 
-.PHONY: default all distready script crx release jshint install push captchas $(npgoals)
+.PHONY: default all distready script crx release jshint install push $(npgoals)
 
 script : $(script)
 
@@ -278,43 +264,40 @@ install : .events/install
 
 push : .events2/push-git .events2/push-web .events2/push-store
 
-captchas : redirect.html $(template_deps)
-	$(template) redirect.html captchas.html url="$(url)"
-	scp captchas.html $(meta_uploadPath)
-
 clean :
-	$(RMDIR) tmp testbuilds .events
+	$(RMDIR) tmp tmp-crx testbuilds .events
 	$(RM) .tests_enabled
 
 cleanrel : clean
 	$(RMDIR) builds
 
 cleanweb :
-	$(RM) test.html captchas.html
+	$(RM) test.html
 
 cleanfull : clean cleanweb
 	$(RMDIR) .events2 dist node_modules
-	$(RM) npm-shrinkwrap.json
 	git worktree prune
 
 withtests :
 	echo true> .tests_enabled
 	-$(MAKE)
 	echo false> .tests_enabled
 
-wrapped : src/meta/npm-shrinkwrap.json
-	$(call CAT,$<,npm-shrinkwrap.json)
-	npm install
+archives :
+	git fetch -n archives
+	git merge --no-commit -s ours archives/gh-pages
+	git show archives/gh-pages:archives.json > src/Archive/archives.json
+	-git commit -am 'Update archive list.'
 
 $(foreach i,1 2 3 4,bump$(i)) :
+	$(MAKE) archives
 	node tools/bump.js $(subst bump,,$@)
 	$(MAKE) .events/CHANGELOG
 	$(MAKE) all
 
 tag :
 	git add builds
 	$(MAKE) cleanrel
-	$(MAKE) wrapped
 	$(MAKE) all
 	git diff --quiet -- builds
 	$(MAKE) tagcommit
@@ -333,7 +316,7 @@ stable : distready
 	git push . HEAD:bstable
 	git tag -af stable -m "$(meta_name) v$(version)."
 	cd dist && git merge --no-commit -s ours stable
-	cd dist && git checkout stable "builds/$(name).*" builds/updates.xml
+	cd dist && git checkout stable "builds/$(name).*" builds/updates.xml builds/updates.json
 	cd dist && git commit -am "Move $(meta_name) v$(version) to stable channel."
 
 web : index.html distready
@@ -343,15 +326,11 @@ web : index.html distready
 	cd dist && git commit -am "Update web page."
 
 update :
-	$(RM) npm-shrinkwrap.json
+	$(RM) package-lock.json
 	npm install --save-dev $(shell node tools/unpinned.js)
 	npm install
-	npm shrinkwrap --dev
-	$(call CAT,npm-shrinkwrap.json,src/meta/npm-shrinkwrap.json)
 
 updatehard :
-	$(RM) npm-shrinkwrap.json
+	$(RM) package-lock.json
 	npm install --save-dev $(shell node tools/unpinned.js latest)
 	npm install
-	npm shrinkwrap --dev
-	$(call CAT,npm-shrinkwrap.json,src/meta/npm-shrinkwrap.json)