From 59b5df7f71b927b59110441fa26c9dd13d95a992 Mon Sep 17 00:00:00 2001 From: jackwener Date: Mon, 9 Mar 2026 20:32:45 +0800 Subject: [PATCH] fix: ClawHub publish (acceptLicenseTerms), add LICENSE, fix score display bug, remove unused var --- .github/workflows/publish-clawhub.yml | 72 +++++++++- LICENSE | 191 ++++++++++++++++++++++++++ pyproject.toml | 2 +- twitter_cli/client.py | 1 - twitter_cli/formatter.py | 2 +- uv.lock | 2 +- 6 files changed, 260 insertions(+), 10 deletions(-) create mode 100644 LICENSE diff --git a/.github/workflows/publish-clawhub.yml b/.github/workflows/publish-clawhub.yml index 5772ffa..bd5234f 100644 --- a/.github/workflows/publish-clawhub.yml +++ b/.github/workflows/publish-clawhub.yml @@ -51,9 +51,69 @@ jobs: fi clawhub --no-input login --token "${CLAWHUB_TOKEN}" --no-browser - clawhub --no-input publish . \ - --slug "${CLAWHUB_SLUG}" \ - --name "${CLAWHUB_NAME}" \ - --version "${VERSION}" \ - --changelog "Release ${VERSION}" \ - --tags latest + + # Workaround: clawhub@0.7.0 publish doesn't send acceptLicenseTerms, + # which the server now requires. Use a Node.js script to publish with + # the corrected payload. + node - <<'PUBLISH_SCRIPT' + const { resolve } = require("path"); + const { readFileSync, statSync, readdirSync } = require("fs"); + const folder = resolve("."); + const slug = process.env.CLAWHUB_SLUG; + const version = process.env.VERSION; + + // Collect text files (same logic as clawhub CLI) + function walk(dir, base = "") { + let files = []; + for (const entry of readdirSync(dir, { withFileTypes: true })) { + const rel = base ? base + "/" + entry.name : entry.name; + if (entry.name.startsWith(".") || entry.name === "node_modules") continue; + if (entry.isDirectory()) { files.push(...walk(dir + "/" + entry.name, rel)); } + else { files.push({ rel, abs: dir + "/" + entry.name }); } + } + return files; + } + const files = walk(folder).filter(f => { + const ext = f.rel.split(".").pop().toLowerCase(); + return ["md","txt","py","toml","yml","yaml","json","cfg","ini","sh","bat"].includes(ext); + }); + + const payload = JSON.stringify({ + slug, + displayName: slug, + version, + changelog: "Release " + version, + tags: ["latest"], + acceptLicenseTerms: true, + }); + + const form = new FormData(); + form.set("payload", payload); + for (const file of files) { + const bytes = readFileSync(file.abs); + const blob = new Blob([bytes], { type: "text/plain" }); + form.append("files", blob, file.rel); + } + + // Read registry and token from clawhub config + const os = require("os"); + const configPath = resolve(os.homedir(), ".config", "clawhub", "config.json"); + let token = ""; + try { + const cfg = JSON.parse(readFileSync(configPath, "utf8")); + token = cfg.token || ""; + } catch {} + if (!token) { console.error("No token found"); process.exit(1); } + + const registry = "https://api.clawhub.io"; + fetch(registry + "/api/v1/skills", { + method: "POST", + headers: { Authorization: "Bearer " + token }, + body: form, + }).then(async r => { + const text = await r.text(); + if (!r.ok) { console.error("Publish failed:", r.status, text); process.exit(1); } + console.log("✔ Published", slug + "@" + version); + }).catch(e => { console.error(e); process.exit(1); }); + PUBLISH_SCRIPT + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4ad1200 --- /dev/null +++ b/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to the Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by the Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding any notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2024 jackwener + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pyproject.toml b/pyproject.toml index 579debd..e50704b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "twitter-cli" -version = "0.3.3" +version = "0.3.4" description = "A CLI for Twitter/X — feed, bookmarks, and user timeline in terminal" readme = "README.md" license = "Apache-2.0" diff --git a/twitter_cli/client.py b/twitter_cli/client.py index d67a885..1e2c08f 100644 --- a/twitter_cli/client.py +++ b/twitter_cli/client.py @@ -22,7 +22,6 @@ logger = logging.getLogger(__name__) # Shared curl_cffi session — impersonates Chrome 133 TLS/JA3/HTTP2 fingerprint _cffi_session = None # type: Optional[Any] # lazy init -_cffi_proxy = None # type: Optional[str] FALLBACK_QUERY_IDS = { diff --git a/twitter_cli/formatter.py b/twitter_cli/formatter.py index afc21d1..0b208ad 100644 --- a/twitter_cli/formatter.py +++ b/twitter_cli/formatter.py @@ -79,7 +79,7 @@ def print_tweet_table(tweets, console=None, title=None): ) # Score - score_str = "%.1f" % tweet.score if tweet.score else "-" + score_str = "%.1f" % tweet.score if tweet.score is not None else "-" table.add_row(str(i + 1), author_text, text, stats, score_str) diff --git a/uv.lock b/uv.lock index abbc186..b910b4e 100644 --- a/uv.lock +++ b/uv.lock @@ -950,7 +950,7 @@ wheels = [ [[package]] name = "twitter-cli" -version = "0.3.2" +version = "0.3.3" source = { editable = "." } dependencies = [ { name = "beautifulsoup4" },