bump package version

CONTRIBUTING.md

@@ -8,13 +8,9 @@ Forbidden:
 
     Create a new issues instead if you are arriving at a thread created by someone else and a have a new relevant point.
 
--   [Evil West](https://github.com/cirosantilli/china-dictatorship#evil-west) posts are OK, but they *must* explain why you think a dictatorship would better solve the problem.
+-   [Evil West](https://.cirosantilli.com/china-dictatorship#evil-west) posts are OK, but they *must* explain why you think a dictatorship would better solve the problem.
 
-    Posting several random evil-West news without explaining why dictatorships handle it better will get you banned, because it is noise: there is freedom of speech in the West and people can already see that information on newspapers who have a million times more viewers than this repo, there's no need to repeat that here. Flooding such posts is a primary [wumao tactic](https://github.com/cirosantilli/china-dictatorship#wumao).
-
-    Bad China news are OK because those are all censored in China and help Chinese people learn about it.
-
-    Any political material that is censored in any country in the West will be accepted.
+    Further rationale at: https://.cirosantilli.com/china-dictatorship#bias
 
 -   generate lots of notifications that don't teach people anything new.
 
@@ -22,15 +18,15 @@ Forbidden:
 
     People don't have that much time to waste.
 
-    If you are still certain that you want really want to shitpost, first see some tips at: https://github.com/cirosantilli/china-dictatorship#shitpost
+    If you are still certain that you want really want to shitpost, first see some tips at: https://.cirosantilli.com/china-dictatorship#shitpost
 
     Remember, you are threading dangerous waters, it is "one Ciro against one million wumaos", and so Ciro doesn't even blink anymore when a block might apply.
 
     But as long as you follow our [shitiquette](https://en.wikipedia.org/wiki/Etiquette), you should be fine.
 
--   swearing/being very aggressive on a [`not-shitpost`](https://github.com/cirosantilli/china-dictatorship) post.
+-   swearing/being very aggressive on a [`not-shitpost`](https://.cirosantilli.com/china-dictatorship#shitpost) post.
 
-    Keep in mind that [Ciro's Chinese sucks](https://github.com/cirosantilli/china-dictatorship#does-ciro-santilli-speak-chinese), so he may not get the full nuance of your comment, especially if you use a ton of [slang](https://github.com/cirosantilli/china-dictatorship#slang).
+    Keep in mind that [Ciro's Chinese sucks](https://.cirosantilli.com/china-dictatorship#does-ciro-santilli-speak-chinese), so he may not get the full nuance of your comment, especially if you use a ton of [slang](https://.cirosantilli.com/china-dictatorship#slang).
 
     On `shitpost` posts however, you can be as aggressive as you want.
 
@@ -55,7 +51,3 @@ If you wish to appeal a punitive measure, please contact me through some unblock
 I will not reply anything non-trivial on Chinese websites, since all of those will be taken down sooner or later, therefore wasting my time. I will just tell you to recontact on a non-Chinese website, or re-post your question with the answer on a Western website.
 
 If OP someone shitposts on GitHub and gets blocked, I will just make that clear by taking a web archive, posting a link on my comment, and setting the `op-block` label on the person's post: https://github.com/cirosantilli/china-dictatorship/labels/op-block
-
-Other blocked users:
-
-- https://github.com/brglng | https://github.com/cirosantilli/china-dictatorship/issues/42#event-2319426123 | https://github.com/isaacs/github/issues/1570 | http://web.archive.org/web/20190505072320/https://github.com/cirosantilli/china-dictatorship/issues/42

Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'asciidoctor', '2.0.10'
+gem 'concurrent-ruby', '1.1.7'
+gem 'tilt', '2.0.10'

Gemfile.lock

@@ -2,12 +2,16 @@ GEM
   remote: https://rubygems.org/
   specs:
     asciidoctor (2.0.10)
+    concurrent-ruby (1.1.7)
+    tilt (2.0.10)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   asciidoctor (= 2.0.10)
+  concurrent-ruby (= 1.1.7)
+  tilt (= 2.0.10)
 
 BUNDLED WITH
    2.0.2

Makefile

@@ -4,12 +4,22 @@ OUT = README.html
 HEAD = head.html
 BODY = README.body.html
 FOOT = foot.html
+MEDIA =
 
-$(OUT): README.adoc $(HEAD) $(FOOT)
+ifeq ($(MEDIA),)
+	MEDIA_CMD =
+else
+	MEDIA_CMD = -a china-dictatorship-media-base='$(MEDIA)'
+endif
+
+$(OUT): README.adoc $(HEAD) $(FOOT) template_dir/*
 	bundle exec asciidoctor \
+		$(MEDIA_CMD) \
 	  --embedded \
 	  --failure-level info \
 	  -o $(BODY) \
+		--template-dir template_dir \
+		--trace \
 	  -v \
 	  '$<'
 	cat $(HEAD) $(BODY) $(FOOT) > '$@'

package.json

@@ -22,5 +22,5 @@
   "scripts": {
     "prepublishOnly": "cp README.adoc README;make"
   },
-  "version": "0.0.65"
+  "version": "0.0.67"
 }

push-mirrors

@@ -4,19 +4,23 @@
 
 set -eux
 
+# Update repo.
+new_version="$(./push-mirrors-bump-package-json-version)"
+./push-mirrors-bump-setup-py-version
+git add package.json
+git add setup.py
+git commit -m 'bump package version'
+git tag -m "$new_version" "$new_version"
 ./push-gh-pages
 
 # NPM package.
 # Updates package.json version, which other systems read if possible.
-new_version="$(./push-mirrors-bump-package-json-version)"
 npm publish
-git add package.json
 
 # Python package.
 # Initial setup:
 #sudo apt install python3-testresources
 #python3 -m pip install --user --upgrade setuptools wheel
-./push-mirrors-bump-setup-py-version
 # Initial one time setup.
 #python3 -m pip install --user setuptools wheel twine
 cp README.adoc README.html china_dictatorship
@@ -26,14 +30,8 @@ python setup.py sdist bdist_wheel
 # https://stackoverflow.com/questions/57935191/twine-is-asking-for-my-password-each-time-how-to-use-the-pypirc
 twine upload dist/*
 rm -rf build dist *.egg-info
-git add setup.py
-
-# Bump package versions
-git commit -m 'bump package version'
-git tag -m "$new_version" "$new_version"
 
 # Push to git mirrors.
-git push --follow-tags
 git push git@gitlab.com:cirosantilli/china-dictatorship.git
 git push git@bitbucket.org:cirosantilli/china-dictatorship.git
 # Nah.

setup.py

@@ -16,7 +16,7 @@ with open(path.join(this_directory, 'README.adoc')) as f:
 
 setup(
     name='china-dictatorship',
-    version='0.0.65',
+    version='0.0.67',
     description='2018新疆改造中心，1989六四事件，1999法轮功 ，2019 996.ICU, 2018包子露宪，2015 710律师劫，2015巴拿马文件 邓家贵，2017低端人口，2008西藏骚乱',
     long_description=long_description,
     # Otherwise upload fails with: "The description failed to render in the default format of reStructuredText."

template_dir/block_image.html.erb

@@ -0,0 +1,15 @@
+<%#encoding:UTF-8%><div<%= @id && %( id="#{@id}") %> class="<%= ['imageblock',@style,role].compact * ' ' %>"<%
+if (attr? :align) || (attr? :float)
+%> style="<%= [("text-align: #{attr :align};" if attr? :align),("float: #{attr :float};" if attr? :float)].compact * ' ' %>"<%
+end %>>
+<div class="content"><%
+if attr? :link %>
+<a class="image" href="<%= attr :link %>"><img src="<%= image_uri(attr :target) %>" loading="lazy" alt="<%= attr :alt %>"<%= (attr? :width) ? %( width="#{attr :width}") : nil %><%= (attr? :height) ? %( height="#{attr :height}") : nil %>></a><%
+else %>
+<img src="<%= image_uri(attr :target) %>" loading="lazy" alt="<%= attr :alt %>"<%= (attr? :width) ? %( width="#{attr :width}") : nil %><%= (attr? :height) ? %( height="#{attr :height}") : nil %>><%
+end %>
+</div><%
+if title? %>
+<div class="title"><%= captioned_title %></div><%
+end %>
+</div>

template_dir/block_video.html.erb

@@ -0,0 +1,34 @@
+<%#encoding:UTF-8%><div<%= @id && %( id="#{@id}") %> class="<%= ['videoblock',@style,role].compact * ' ' %>"><%
+if title? %>
+<div class="title"><%= captioned_title %></div><%
+end %>
+<div class="content"><%
+case attr :poster
+when 'vimeo'
+  start_anchor = (attr? :start) ? %(#at=#{attr :start}) : nil
+  delimiter = '?'
+  autoplay_param = (option? :autoplay) ? %(#{delimiter}autoplay=1) : nil
+  delimiter = '&amp;' if autoplay_param
+  loop_param = (option? :loop) ? %(#{delimiter}loop=1) : nil
+  src = %(//player.vimeo.com/video/#{attr :target}#{start_anchor}#{autoplay_param}#{loop_param}) %>
+<iframe<%= (attr? :width) ? %( width="#{attr :width}") : nil %><%= (attr? :height) ? %( height="#{attr :height}") : nil %> src="<%= src %>" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe><%
+when 'youtube'
+  params = ['rel=0']
+  params << %(start=#{attr :start}) if attr? :start
+  params << %(end=#{attr :end}) if attr? :end
+  params << 'autoplay=1' if option? :autoplay
+  params << 'loop=1' if option? :loop
+  params << 'controls=0' if option? :nocontrols
+  src = %(//www.youtube.com/embed/#{attr :target}?#{params * '&amp;'}) %>
+<iframe loading="lazy"<%= (attr? :width) ? %( width="#{attr :width}") : nil %><%= (attr? :height) ? %( height="#{attr :height}") : nil %> src="<%= src %>" frameborder="0"<%= (option? :nofullscreen) ? nil : ' allowfullscreen' %>></iframe><%
+else %>
+<video src="<%= media_uri(attr :target) %>"<%= (attr? :width) ? %( width="#{attr :width}") : nil %><%= (attr? :height) ? %( height="#{attr :height}") : nil %><%
+  if attr? :poster %> poster="<%= media_uri(attr :poster) %>"<% end
+  if option? :autoplay %> autoplay<% end
+  unless option? :nocontrols %> controls<% end
+  if option? :loop %> loop<% end %>>
+Your browser does not support the video tag.
+</video><%
+end %>
+</div>
+</div>