From a2b48580e32e3f40daeb09ed76ca5df5eace800e Mon Sep 17 00:00:00 2001 From: wuyingren Date: Mon, 15 Jul 2019 18:50:57 +0800 Subject: [PATCH] Add option to see animated emojos Add option to see unlisted emojos --- .gitignore | 133 ++++++++++++++++++++++++++++++++++++++++++- emojos.py | 26 +++++++-- templates/emojo.html | 22 +++++-- templates/index.html | 12 +++- 4 files changed, 180 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index fffc64d..855b3cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,133 @@ -__pycache__ +# Created by https://www.gitignore.io/api/python +# Edit at https://www.gitignore.io/?templates=python + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# End of https://www.gitignore.io/api/python + *.swp +.vscode/ \ No newline at end of file diff --git a/emojos.py b/emojos.py index 614eddb..ddf4924 100644 --- a/emojos.py +++ b/emojos.py @@ -25,13 +25,26 @@ app = Flask(__name__) @app.route('/') def emojo(domain): + if request.args.get('filter_all','') == 'on': + filter_all = True + else: + filter_all = False + if request.args.get('filter_animated','') == 'on': + filter_animated = True + else: + filter_animated = False + try: url = urllib.parse.urlunsplit( ('https', domain, '/api/v1/custom_emojis', '', '')) - emojo = sorted(filter(lambda x: x.get('visible_in_picker', True), - requests.get(url).json()), - key=operator.itemgetter('shortcode')) - return render_template('emojo.html', domain=domain, emojo=emojo) + if filter_all: + emojo = sorted(requests.get(url).json(), + key=operator.itemgetter('shortcode')) + else: + emojo = sorted(filter(lambda x: x.get('visible_in_picker', True), + requests.get(url).json()), + key=operator.itemgetter('shortcode')) + return render_template('emojo.html', domain=domain, emojo=emojo, filter_animated=filter_animated) except requests.exceptions.RequestException as e: return render_template('oh_no.html', domain=domain) @@ -57,7 +70,10 @@ def code(): def index(): if request.method == 'POST': if 'instance' in request.form: - return redirect(url_for('emojo', domain=request.form['instance'])) + filter_all = request.form.get('filter_all') + filter_animated = request.form.get('filter_animated') + return redirect(url_for('emojo', domain=request.form['instance'], + filter_all=filter_all, filter_animated=filter_animated)) else: return redirect(url_for('index')) else: diff --git a/templates/emojo.html b/templates/emojo.html index 5535f08..dcc710a 100644 --- a/templates/emojo.html +++ b/templates/emojo.html @@ -6,12 +6,22 @@ click/touch to copy to clipboard

- {% for emoj in emojo %} -
-
:{{ emoj.shortcode }}:
-
:{{ emoj.shortcode }}:
-
- {% endfor %} + {% if filter_animated %} + {% for emoj in emojo %} +
+
:{{ emoj.shortcode }}:
+
:{{ emoj.shortcode }}:
+
+ {% endfor %} + + {% else %} + {% for emoj in emojo %} +
+
:{{ emoj.shortcode }}:
+
:{{ emoj.shortcode }}:
+
+ {% endfor %} + {% endif %}
{% endblock body %} {% block script %} diff --git a/templates/index.html b/templates/index.html index 8411328..b555442 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,7 +3,17 @@ {% block body %}

get the emojos for:

- +
+ +
+
+ + +
+
+ + +

(“emojo” is the semi-jokey term for custom emoji on Mastodon.)