From 952d77a8307f72504ad8b8c71ec5dba8d22cce28 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Fri, 14 Aug 2020 16:41:45 +0200 Subject: [PATCH 1/3] Add btc tip --- .pylintrc | 597 ++++++++++++++++++++++++++++++++++ zerobin/cli.py | 25 +- zerobin/default_settings.py | 2 + zerobin/paste.py | 26 +- zerobin/routes.py | 2 + zerobin/static/js/behavior.js | 16 +- zerobin/utils.py | 38 +-- zerobin/views/home.tpl | 16 +- zerobin/views/paste.tpl | 24 +- 9 files changed, 690 insertions(+), 56 deletions(-) create mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..6310bbd --- /dev/null +++ b/.pylintrc @@ -0,0 +1,597 @@ +[MASTER] + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-whitelist= + +# Specify a score threshold to be exceeded before program exits with error. +fail-under=10 + +# Add files or directories to the blacklist. They should be base names, not +# paths. +ignore=CVS + +# Add files or directories matching the regex patterns to the blacklist. The +# regex matches against base names, not paths. +ignore-patterns= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=yes + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED. +confidence= + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then reenable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=print-statement, + parameter-unpacking, + unpacking-in-except, + old-raise-syntax, + backtick, + long-suffix, + old-ne-operator, + old-octal-literal, + import-star-module-level, + non-ascii-bytes-literal, + raw-checker-failed, + bad-inline-option, + locally-disabled, + file-ignored, + suppressed-message, + useless-suppression, + deprecated-pragma, + use-symbolic-message-instead, + apply-builtin, + basestring-builtin, + buffer-builtin, + cmp-builtin, + coerce-builtin, + execfile-builtin, + file-builtin, + long-builtin, + raw_input-builtin, + reduce-builtin, + standarderror-builtin, + unicode-builtin, + xrange-builtin, + coerce-method, + delslice-method, + getslice-method, + setslice-method, + no-absolute-import, + old-division, + dict-iter-method, + dict-view-method, + next-method-called, + metaclass-assignment, + indexing-exception, + raising-string, + reload-builtin, + oct-method, + hex-method, + nonzero-method, + cmp-method, + input-builtin, + round-builtin, + intern-builtin, + unichr-builtin, + map-builtin-not-iterating, + zip-builtin-not-iterating, + range-builtin-not-iterating, + filter-builtin-not-iterating, + using-cmp-argument, + eq-without-hash, + div-method, + idiv-method, + rdiv-method, + exception-message-attribute, + invalid-str-codec, + sys-max-int, + bad-python3-import, + deprecated-string-function, + deprecated-str-translate-call, + deprecated-itertools-function, + deprecated-types-field, + next-method-defined, + dict-items-not-iterating, + dict-keys-not-iterating, + dict-values-not-iterating, + deprecated-operator-function, + deprecated-urllib-function, + xreadlines-attribute, + deprecated-sys-function, + exception-escape, + comprehension-escape, + invalid-name, + attribute-defined-outside-init + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable=c-extension-no-member + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'error', 'warning', 'refactor', and 'convention' +# which contain the number of messages in each category, as well as 'statement' +# which is the total number of statements analyzed. This score is used by the +# global evaluation report (RP0004). +evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +#msg-template= + +# Set the output format. Available formats are text, parseable, colorized, json +# and msvs (visual studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +output-format=text + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether missing members accessed in mixin class should be ignored. A +# mixin class is detected if its name ends with "mixin" (case insensitive). +ignore-mixin-members=yes + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,SettingsContainer + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis). It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[SIMILARITIES] + +# Ignore comments when computing similarities. +ignore-comments=yes + +# Ignore docstrings when computing similarities. +ignore-docstrings=yes + +# Ignore imports when computing similarities. +ignore-imports=no + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# List of optional constructs for which whitespace checking is disabled. `dict- +# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. +# `trailing-comma` allows a space between comma and closing bracket: (a, ). +# `empty-line` allows space-only lines. +no-space-check=trailing-comma, + dict-separator + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +#notes-rgx= + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. Default to name +# with leading underscore. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. +#class-attribute-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. +#variable-rgx= + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. Available dictionaries: none. To make it work, +# install the python-enchant package. +spelling-dict= + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[CLASSES] + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict, + _fields, + _replace, + _source, + _make + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=cls + + +[DESIGN] + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules=optparse,tkinter.tix + +# Create a graph of external dependencies in the given file (report RP0402 must +# not be disabled). +ext-import-graph= + +# Create a graph of every (i.e. internal and external) dependencies in the +# given file (report RP0402 must not be disabled). +import-graph= + +# Create a graph of internal dependencies in the given file (report RP0402 must +# not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when being caught. Defaults to +# "BaseException, Exception". +overgeneral-exceptions=BaseException, + Exception diff --git a/zerobin/cli.py b/zerobin/cli.py index c879752..b39c2cb 100644 --- a/zerobin/cli.py +++ b/zerobin/cli.py @@ -34,7 +34,6 @@ def runserver( data_dir="", debug=None, version=False, - paste_id_length=None, server="paste", ): if version: @@ -42,22 +41,32 @@ def runserver( sys.exit(0) try: - settings, app = get_app(debug=debug, config_dir=config_dir, data_dir=data_dir,) + updated_settings, app = get_app( + debug=debug, config_dir=config_dir, data_dir=data_dir, + ) except SettingsValidationError as err: - print("Configuration error: %s" % err.message, file=sys.stderr) + print("Configuration error: %s" % err, file=sys.stderr) sys.exit(1) - settings.HOST = host or os.environ.get("ZEROBIN_HOST", settings.HOST) - settings.PORT = port or os.environ.get("ZEROBIN_PORT", settings.PORT) + updated_settings.HOST = host or os.environ.get( + "ZEROBIN_HOST", updated_settings.HOST + ) + updated_settings.PORT = port or os.environ.get( + "ZEROBIN_PORT", updated_settings.PORT + ) - if settings.DEBUG: + if updated_settings.DEBUG: print(f"Admin URL: {settings.ADMIN_URL}") print() run( - app, host=settings.HOST, port=settings.PORT, reloader=True, server=server, + app, + host=updated_settings.HOST, + port=updated_settings.PORT, + reloader=True, + server=server, ) else: - run(app, host=settings.HOST, port=settings.PORT, server=server) + run(app, host=settings.HOST, port=updated_settings.PORT, server=server) # The regex parse the url and separate the paste's id from the decription key diff --git a/zerobin/default_settings.py b/zerobin/default_settings.py index edab738..0cee5ff 100644 --- a/zerobin/default_settings.py +++ b/zerobin/default_settings.py @@ -32,3 +32,5 @@ REFRESH_COUNTER = 60 # in seconds # for PASTE_ID_LENGTH=8, for example, it's 2^(6*8) = 281 474 976 710 656 PASTE_ID_LENGTH = 8 +# The Bitcoin address displayed in the paste if the author didn't chose one +DEFAULT_BTC_TIP_ADDRESS = "bc1q4x6nwp56s9enmwtsa8um0gywpxdzeyrdluga04" diff --git a/zerobin/paste.py b/zerobin/paste.py index 0bf3c5f..25a0290 100644 --- a/zerobin/paste.py +++ b/zerobin/paste.py @@ -1,7 +1,3 @@ -# coding: utf-8 - -from __future__ import unicode_literals, absolute_import - import os import hashlib import base64 @@ -12,7 +8,7 @@ from datetime import datetime, timedelta import bleach -from zerobin.utils import settings, to_ascii, as_unicode, safe_open as open +from zerobin.utils import settings class Paste(object): @@ -21,7 +17,7 @@ class Paste(object): calculation of the expiration date. """ - DIR_CACHE = set() + DIR_CACHE: set = set() DURATIONS = { "1_day": 24 * 3600, @@ -30,12 +26,19 @@ class Paste(object): } def __init__( - self, uuid=None, uuid_length=None, content=None, expiration=None, title="" + self, + uuid=None, + uuid_length=None, + content=None, + expiration=None, + title="", + btc_tip_address="", ): self.content = content self.expiration = self.get_expiration(expiration) self.title = bleach.clean(title, strip=True)[:60] + self.btc_tip_address = bleach.clean(btc_tip_address, strip=True)[:50] if not uuid: # generate the uuid from the decoded content by hashing it @@ -120,6 +123,7 @@ class Paste(object): expiration=expiration, content=content, title=" ".join(metadata.get("title", "").split()), + btc_tip_address=" ".join(metadata.get("btc_tip_address", "").split()), ) @classmethod @@ -184,14 +188,18 @@ class Paste(object): if "burn_after_reading" == self.expiration: expiration = self.expiration + "#%s" % datetime.now() # TODO: use UTC dates else: - expiration = as_unicode(self.expiration) + expiration = str(self.expiration) # write the paste with open(self.path, "w") as f: f.write(expiration + "\n") f.write(self.content + "\n") + metadata = {} if self.title: - f.write(json.dumps({"title": self.title}) + "\n") + metadata["title"] = self.title + if self.btc_tip_address: + metadata["btc_tip_address"] = self.btc_tip_address + f.write(json.dumps(metadata) + "\n") return self diff --git a/zerobin/routes.py b/zerobin/routes.py index 53d9a74..369e15a 100644 --- a/zerobin/routes.py +++ b/zerobin/routes.py @@ -130,12 +130,14 @@ def create_paste(): expiration = request.forms.get("expiration", "burn_after_reading") title = request.forms.get("title", "") + btc_tip_address = request.forms.get("btcTipAddress", "") paste = Paste( expiration=expiration, content=content, uuid_length=settings.PASTE_ID_LENGTH, title=title, + btc_tip_address=btc_tip_address, ) paste.save() diff --git a/zerobin/static/js/behavior.js b/zerobin/static/js/behavior.js index ec7614d..455e022 100644 --- a/zerobin/static/js/behavior.js +++ b/zerobin/static/js/behavior.js @@ -34,11 +34,13 @@ const app = new Vue({ content: '', downloadLink: {}, title: '', + btcTipAddress: '' }, newPaste: { expiration: '1_day', content: '', title: '', + btcTipAddress: '' }, messages: [], /** Check for browser support of the named featured. Store the result @@ -118,11 +120,15 @@ const app = new Vue({ document.querySelector('.submit-form').style.display = "inherit"; document.querySelector('.paste-form').style.display = "none"; - document.querySelector('h1').style.display = "none"; + let title = document.querySelector('h1'); + if (title) { + title.style.display = "none"; + } let content = document.getElementById('content'); content.value = zerobin.getPasteContent(); content.dispatchEvent(new Event('change')); this.newPaste.title = this.currentPaste.title; + this.newPaste.btcTipAddress = this.currentPaste.btcTipAddress; }, handleCancelClone: () => { @@ -241,7 +247,8 @@ const app = new Vue({ var data = { content: content, expiration: app.newPaste.expiration, - title: app.newPaste.title + title: app.newPaste.title, + btcTipAddress: app.newPaste.btcTipAddress }; var sizebytes = zerobin.count(JSON.stringify(data)); var oversized = sizebytes > zerobin.max_size; // 100kb - the others header information @@ -867,6 +874,11 @@ window.onload = function () { app.currentPaste.title = title.innerText; } + let btcTipAddress = document.querySelector('.btc-tip-address a'); + if (btcTipAddress) { + app.currentPaste.btcTipAddress = btcTipAddress.innerText; + } + } /* Display previous pastes */ diff --git a/zerobin/utils.py b/zerobin/utils.py index 02c3bb2..c4f3201 100644 --- a/zerobin/utils.py +++ b/zerobin/utils.py @@ -1,8 +1,5 @@ -import codecs -import unicodedata import hashlib import secrets -from functools import partial from pathlib import Path @@ -35,12 +32,12 @@ class SettingsContainer(object): cls._instance.update_with_module(default_settings) return cls._instance - def update_with_dict(self, dict): + def update_with_dict(self, mapping): """ Update settings with values from the given mapping object. (Taking only variable with uppercased name) """ - for name, value in dict.items(): + for name, value in mapping.items(): if name.isupper(): setattr(self, name, value) return self @@ -58,43 +55,22 @@ class SettingsContainer(object): Create an instance of SettingsContainer with values based on the one in the passed module. """ - settings = cls() - settings.update_with_module(module) - return settings + params = cls() + params.update_with_module(module) + return params def update_with_file(self, filepath): """ Update settings with values from the given module file. Uses update_with_dict() behind the scenes. """ - settings = run_path(filepath) - return self.update_with_dict(settings) + params = run_path(filepath) + return self.update_with_dict(params) settings = SettingsContainer() -def to_ascii(utext): - """ Take a unicode string and return ascii bytes. - - Try to replace non ASCII char by similar ASCII char. If it can't, - replace it with "?". - """ - return unicodedata.normalize("NFKD", utext).encode("ascii", "replace") - - -# Make sure to always specify encoding when using open in Python 2 or 3 -safe_open = partial(codecs.open, encoding="utf8") - - -def as_unicode(obj): - """ Return the unicode representation of an object """ - try: - return unicode(obj) - except NameError: - return str(obj) - - def ensure_app_context(data_dir=None, config_dir=None): """ Ensure all the variable things we generate are available. diff --git a/zerobin/views/home.tpl b/zerobin/views/home.tpl index bd2b911..68220a5 100644 --- a/zerobin/views/home.tpl +++ b/zerobin/views/home.tpl @@ -32,9 +32,19 @@ - +

+ +

+
+
+ BTC tip +
+ +
diff --git a/zerobin/views/paste.tpl b/zerobin/views/paste.tpl index ed45106..2bed438 100644 --- a/zerobin/views/paste.tpl +++ b/zerobin/views/paste.tpl @@ -64,6 +64,11 @@
+
+ Tip in bitcoin: {{ paste.btc_tip_address or settings.DEFAULT_BTC_TIP_ADDRESS}} +
+
@@ -120,9 +125,22 @@
- +

+ +

+

+ +

+
+ BTC tip +
+ +
+ +

> From b9831c7f60edf24b85debf028902315ddd5a2020 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Fri, 14 Aug 2020 16:45:06 +0200 Subject: [PATCH 2/3] In dev mode, display the full admin URL at server start --- zerobin/cli.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zerobin/cli.py b/zerobin/cli.py index b39c2cb..5c81bd9 100644 --- a/zerobin/cli.py +++ b/zerobin/cli.py @@ -56,7 +56,9 @@ def runserver( ) if updated_settings.DEBUG: - print(f"Admin URL: {settings.ADMIN_URL}") + print( + f"Admin URL for dev: http://{updated_settings.HOST}:{updated_settings.PORT}{settings.ADMIN_URL}" + ) print() run( app, From 701fed35b2dc0da8bb248746b7052184d9a655f0 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Fri, 14 Aug 2020 16:54:57 +0200 Subject: [PATCH 3/3] Fix WSGI prod file --- zerobin/wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zerobin/wsgi.py b/zerobin/wsgi.py index 33fb133..3add608 100644 --- a/zerobin/wsgi.py +++ b/zerobin/wsgi.py @@ -1,3 +1,3 @@ -from zerobin.wsgi import setup_app +from zerobin.routes import get_app settings, app = get_app()