diff --git a/sticker/lib/matrix.py b/sticker/lib/matrix.py index e506e83..03e00ac 100644 --- a/sticker/lib/matrix.py +++ b/sticker/lib/matrix.py @@ -55,10 +55,12 @@ async def load_config(path: str) -> None: config = json.load(config_file) homeserver_url = config["homeserver"] access_token = config["access_token"] + giphy_api_key = config["giphy_api_key"] except FileNotFoundError: - print("Matrix config file not found. Please enter your homeserver and access token.") + print("Matrix config file not found. Please enter your homeserver and access token. Enter the Giphy API token if required, leave blank to disable the gif picker.") homeserver_url = input("Homeserver URL: ") access_token = input("Access token: ") + giphy_api_key = input("Giphy API key: ") whoami_url = URL(homeserver_url) / "_matrix" / "client" / "r0" / "account" / "whoami" if whoami_url.scheme not in ("https", "http"): whoami_url = whoami_url.with_scheme("https") @@ -67,7 +69,8 @@ async def load_config(path: str) -> None: json.dump({ "homeserver": homeserver_url, "user_id": user_id, - "access_token": access_token + "access_token": access_token, + "giphy_api_key": giphy_api_key }, config_file) print(f"Wrote config to {path}") diff --git a/sticker/version.py b/sticker/version.py index 47f7fff..a6c0452 100644 --- a/sticker/version.py +++ b/sticker/version.py @@ -1 +1,6 @@ -from .get_version import git_tag, git_revision, version, linkified_version +# Generated in setup.py + +git_tag = None +git_revision = 'f59406a4' +version = '0.1.0+dev.f59406a4' +linkified_version = '0.1.0+dev.[f59406a4](https://github.com/maunium/stickerpicker/commit/f59406a47a6778cd402e656ffb64f667335f665a)' diff --git a/web/index.html b/web/index.html index 6312814..41e2633 100644 --- a/web/index.html +++ b/web/index.html @@ -4,8 +4,8 @@
${this.state.error}
-${this.state.error}
+