fuzzyworld-tools / commit
Separate address for contributions: contrib-68uq+<repo>@fuzzyworld.net
server/gen.py | 6 +++--- server/site/contribute/index.html | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/gen.py b/server/gen.py index fd0aa52..9fa1db6 100755 --- a/server/gen.py +++ b/server/gen.py @@ -404,9 +404,9 @@ def build_summary(repo, out, name, desc, files, ctx, commits, empty): clone = f"git clone {BASE_URL}/{name}.git" app = app_url(name) links = f'<p class="meta">App: <a href="{app}">{esc(app)}</a></p>' if app else "" - contact = f"bugs-k7q4+{name}@fuzzyworld.net" - links += (f'<p class="meta">Contribute or report a bug: <a href="mailto:{esc(contact)}">{esc(contact)}</a>' - f' · <a href="/contribute/">how</a></p>') + contrib, bugs = f"contrib-68uq+{name}@fuzzyworld.net", f"bugs-k7q4+{name}@fuzzyworld.net" + links += (f'<p class="meta">Contribute: <a href="mailto:{esc(contrib)}">{esc(contrib)}</a>' + f' (<a href="/contribute/">how</a>) · Report a bug: <a href="mailto:{esc(bugs)}">{esc(bugs)}</a></p>') readme_html = "" if not empty: lower = {p.lower(): p for p in files if "/" not in p} diff --git a/server/site/contribute/index.html b/server/site/contribute/index.html index 2cec09d..1d605a9 100644 --- a/server/site/contribute/index.html +++ b/server/site/contribute/index.html @@ -22,7 +22,7 @@ <li>Make your change on a branch, and push that branch to <strong>any</strong> public git host you like (GitHub, Codeberg, GitLab, your own server).</li> <li>Email the repository URL, the branch name and a short description to - <code>bugs-k7q4+<repo>@fuzzyworld.net</code>, using the repository's name in place of + <code>contrib-68uq+<repo>@fuzzyworld.net</code>, using the repository's name in place of <code><repo></code>.</li> </ol> <p>I fetch the branch, review it locally, and reply by email.</p> @@ -30,12 +30,12 @@ <h2>2. Email a patch</h2> <p>Good for small changes. Commit your change, then create a patch file:</p> <pre>git format-patch origin/main</pre> - <p>and attach the <code>.patch</code> file(s) to an email to <code>bugs-k7q4+<repo>@fuzzyworld.net</code>. + <p>and attach the <code>.patch</code> file(s) to an email to <code>contrib-68uq+<repo>@fuzzyworld.net</code>. If you use <code>git send-email</code>, that address works there too.</p> <h2>Bug reports and ideas</h2> - <p>Same address, no git needed. Many of the apps have a <strong>report</strong> link that fills in the - details for you.</p> + <p>No git needed: email <code>bugs-k7q4+<repo>@fuzzyworld.net</code>. Many of the apps have a + <strong>report</strong> link that fills in the details for you.</p> <h2>Before you send</h2> <ul>