From dbc3a9fbb8017cf91404d50be9986b89a1a56275 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 5 Jun 2024 13:02:34 +0300
Subject: [PATCH] Don't prompt for giphy api key by default
---
sticker/lib/matrix.py | 13 -------------
web/src/giphy.js | 2 +-
web/src/index.js | 4 +++-
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/sticker/lib/matrix.py b/sticker/lib/matrix.py
index d048603..de436a7 100644
--- a/sticker/lib/matrix.py
+++ b/sticker/lib/matrix.py
@@ -55,23 +55,10 @@ async def load_config(path: str) -> None:
config = json.load(config_file)
homeserver_url = config["homeserver"]
access_token = config["access_token"]
- try:
- giphy_api_key = config["giphy_api_key"]
- giphy_mxc_prefix = config["giphy_mxc_prefix"]
- except KeyError:
- # these two are not mandatory, assume GIF search is disabled
- print("Giphy related parameters not found in the config file.")
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: ")
- print("If you want to enable GIF search, enter your giphy API key. Otherwise, leave it empty.")
- giphy_api_key = input("Giphy API key: ").strip()
- giphy_mxc_prefix = "mxc://giphy.mau.dev/"
- if giphy_api_key:
- print("If you want to self-host the matrix->giphy proxy, enter the mxc URI prefix here")
- print("Defaults to mxc://giphy.mau.dev/ if left empty.")
- giphy_mxc_prefix = input("Giphy MXC prefix: ").strip() or giphy_mxc_prefix
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")
diff --git a/web/src/giphy.js b/web/src/giphy.js
index 16dcae3..3e804bc 100644
--- a/web/src/giphy.js
+++ b/web/src/giphy.js
@@ -3,7 +3,7 @@ import * as widgetAPI from "./widget-api.js";
import {SearchBox} from "./search-box.js";
const GIPHY_SEARCH_DEBOUNCE = 1000
-let GIPHY_API_KEY = ""
+let GIPHY_API_KEY = "HQku8974Uq5MZn3MZns46kXn2R4GDm75"
let GIPHY_MXC_PREFIX = "mxc://giphy.mau.dev/"
export function giphyIsEnabled() {
diff --git a/web/src/index.js b/web/src/index.js
index ff570da..273ad7e 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -166,7 +166,9 @@ class App extends Component {
}
const indexData = await indexRes.json()
HOMESERVER_URL = indexData.homeserver_url || HOMESERVER_URL
- setGiphyAPIKey(indexData.giphy_api_key, indexData.giphy_mxc_prefix)
+ if (indexData.giphy_api_key !== undefined) {
+ setGiphyAPIKey(indexData.giphy_api_key, indexData.giphy_mxc_prefix)
+ }
// TODO only load pack metadata when scrolled into view?
for (const packFile of indexData.packs) {
let packRes
--
GitLab