mirror of
https://github.com/maunium/stickerpicker.git
synced 2024-11-10 05:37:22 +01:00
Ask for Matrix access token on first run
This commit is contained in:
parent
d698f058b5
commit
4190057b3c
@ -6,11 +6,10 @@ A fast and simple Matrix sticker picker widget. Tested on Element Web & Android.
|
|||||||
1. Create with `virtualenv -p python3 .`
|
1. Create with `virtualenv -p python3 .`
|
||||||
2. Activate with `source ./bin/activate`
|
2. Activate with `source ./bin/activate`
|
||||||
2. Install dependencies with `pip install -r requirements.txt`
|
2. Install dependencies with `pip install -r requirements.txt`
|
||||||
3. Copy `example-config.json` to `config.json` and set your homeserver URL and access token
|
3. Run `python3 import.py <pack urls...>`
|
||||||
(used for uploading stickers to Matrix).
|
* On the first run, it'll prompt you to log in to Matrix and Telegram.
|
||||||
4. Run `python3 import.py <pack urls...>`
|
* The Matrix URL and access token are stored in `config.json` by default.
|
||||||
* On the first run, it'll prompt you to log in with a bot token or a telegram account.
|
* The Telethon session data is stored in `sticker-import.session` by default.
|
||||||
The session data is stored in `sticker-import.session` by default.
|
|
||||||
* By default, the pack data will be written to `web/packs/`.
|
* By default, the pack data will be written to `web/packs/`.
|
||||||
* You can pass as many pack URLs as you want.
|
* You can pass as many pack URLs as you want.
|
||||||
* You can re-run the command with the same URLs to update packs.
|
* You can re-run the command with the same URLs to update packs.
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
{
|
|
||||||
"homeserver": "https://example.com",
|
|
||||||
"access_token": "foo"
|
|
||||||
}
|
|
35
import.py
35
import.py
@ -31,11 +31,36 @@ parser.add_argument("--output-dir", help="Directory to write packs to", default=
|
|||||||
parser.add_argument("pack", help="Sticker pack URLs to import", action="append", nargs="*")
|
parser.add_argument("pack", help="Sticker pack URLs to import", action="append", nargs="*")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
with open(args.config) as config_file:
|
|
||||||
config = json.load(config_file)
|
async def whoami(url: URL, access_token: str) -> str:
|
||||||
homeserver_url = config["homeserver"]
|
headers = {"Authorization": f"Bearer {access_token}"}
|
||||||
upload_url = URL(homeserver_url) / "_matrix" / "media" / "r0" / "upload"
|
async with ClientSession() as sess, sess.get(url, headers=headers) as resp:
|
||||||
access_token = config["access_token"]
|
resp.raise_for_status()
|
||||||
|
user_id = (await resp.json())["user_id"]
|
||||||
|
print(f"Access token validated (user ID: {user_id})")
|
||||||
|
return user_id
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(args.config) as config_file:
|
||||||
|
config = json.load(config_file)
|
||||||
|
homeserver_url = config["homeserver"]
|
||||||
|
access_token = config["access_token"]
|
||||||
|
except FileNotFoundError:
|
||||||
|
print("Matrix config file not found. Please enter your homeserver and access token.")
|
||||||
|
homeserver_url = input("Homeserver URL: ")
|
||||||
|
access_token = input("Access token: ")
|
||||||
|
whoami_url = URL(homeserver_url) / "_matrix" / "client" / "r0" / "account" / "whoami"
|
||||||
|
user_id = asyncio.run(whoami(whoami_url, access_token))
|
||||||
|
with open(args.config, "w") as config_file:
|
||||||
|
json.dump({
|
||||||
|
"homeserver": homeserver_url,
|
||||||
|
"user_id": user_id,
|
||||||
|
"access_token": access_token
|
||||||
|
}, config_file)
|
||||||
|
print(f"Wrote config to {args.config}")
|
||||||
|
|
||||||
|
upload_url = URL(homeserver_url) / "_matrix" / "media" / "r0" / "upload"
|
||||||
|
|
||||||
|
|
||||||
async def upload(data: bytes, mimetype: str, filename: str) -> str:
|
async def upload(data: bytes, mimetype: str, filename: str) -> str:
|
||||||
|
Loading…
Reference in New Issue
Block a user