ProfessionalUwU/stickerpicker
1
0
Fork 1
mirror of https://github.com/maunium/stickerpicker.git synced 2025-08-28 02:41:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Feat: Conditional loading of the GIF search tab based on API Key

Browse Source
This commit is contained in:
Nischay
2024-05-11 15:47:58 +05:30
parent 2e1b333cbb
commit c4588f19a7
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sticker/lib/matrix.py
View File

@@ -55,10 +55,12 @@ async def load_config(path: str) -> None:
config = json.load(config_file) config = json.load(config_file)
homeserver_url = config["homeserver"] homeserver_url = config["homeserver"]
access_token = config["access_token"] access_token = config["access_token"]
giphy_api_key = config["giphy_api_key"]
except FileNotFoundError: 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: ") homeserver_url = input("Homeserver URL: ")
access_token = input("Access token: ") access_token = input("Access token: ")
giphy_api_key = input("Giphy API key: ")
whoami_url = URL(homeserver_url) / "_matrix" / "client" / "r0" / "account" / "whoami" whoami_url = URL(homeserver_url) / "_matrix" / "client" / "r0" / "account" / "whoami"
if whoami_url.scheme not in ("https", "http"): if whoami_url.scheme not in ("https", "http"):
whoami_url = whoami_url.with_scheme("https") whoami_url = whoami_url.with_scheme("https")
@@ -67,7 +69,8 @@ async def load_config(path: str) -> None:
json.dump({ json.dump({
"homeserver": homeserver_url, "homeserver": homeserver_url,
"user_id": user_id, "user_id": user_id,
"access_token": access_token "access_token": access_token,
"giphy_api_key": giphy_api_key
}, config_file) }, config_file)
print(f"Wrote config to {path}") print(f"Wrote config to {path}")

12
web/src/index.js
View File

@@ -31,6 +31,7 @@ if (params.has('config')) {
} }
// This is updated from packs/index.json // This is updated from packs/index.json
let HOMESERVER_URL = "https://matrix-client.matrix.org" let HOMESERVER_URL = "https://matrix-client.matrix.org"
let GIPHY_API_KEY = ""
const makeThumbnailURL = mxc => `${HOMESERVER_URL}/_matrix/media/r0/thumbnail/${mxc.substr(6)}?height=128&width=128&method=scale` const makeThumbnailURL = mxc => `${HOMESERVER_URL}/_matrix/media/r0/thumbnail/${mxc.substr(6)}?height=128&width=128&method=scale`
@@ -66,7 +67,8 @@ class GiphySearchTab extends Component {
async searchGifs() { async searchGifs() {
this.setState({ loading: true }); this.setState({ loading: true });
try { try {
const apiKey = "Gc7131jiJuvI7IdN0HZ1D7nh0ow5BU6g"; // const apiKey = "Gc7131jiJuvI7IdN0HZ1D7nh0ow5BU6g";
const apiKey = GIPHY_API_KEY;
const url = `https://api.giphy.com/v1/gifs/search?q=${this.state.searchTerm}&api_key=${apiKey}`; const url = `https://api.giphy.com/v1/gifs/search?q=${this.state.searchTerm}&api_key=${apiKey}`;
this.setState({ loading: true }); this.setState({ loading: true });
const response = await fetch(url); const response = await fetch(url);
@@ -131,7 +133,7 @@ class GiphySearchTab extends Component {
<div class="pack-list"> <div class="pack-list">
<section class="stickerpack"> <section class="stickerpack">
<div class="sticker-list"> <div class="sticker-list">
${gifs.map((gif) => html` ${GIPHY_API_KEY !== "" && gifs.map((gif) => html`
<div class="sticker" onClick=${() => this.handleGifClick(gif)} data-gif-id=${gif.id}> <div class="sticker" onClick=${() => this.handleGifClick(gif)} data-gif-id=${gif.id}>
<img src=${gif.images.fixed_height.url} alt=${gif.title} class="visible" data=/> <img src=${gif.images.fixed_height.url} alt=${gif.title} class="visible" data=/>
</div> </div>
@@ -262,6 +264,7 @@ class App extends Component {
} }
const indexData = await indexRes.json() const indexData = await indexRes.json()
HOMESERVER_URL = indexData.homeserver_url || HOMESERVER_URL HOMESERVER_URL = indexData.homeserver_url || HOMESERVER_URL
GIPHY_API_KEY = indexData.giphy_api_key || ""
// TODO only load pack metadata when scrolled into view? // TODO only load pack metadata when scrolled into view?
for (const packFile of indexData.packs) { for (const packFile of indexData.packs) {
let packRes let packRes
@@ -404,9 +407,12 @@ class App extends Component {
</div> </div>
`} `}
${this.state.activeTab === "gifs" && html` ${this.state.activeTab === "gifs" && GIPHY_API_KEY !== "" && html`
<${GiphySearchTab} send=${this.sendGIF} /> <${GiphySearchTab} send=${this.sendGIF} />
`} `}
${this.state.activeTab === "gifs" && GIPHY_API_KEY === "" && html`
<h1><center>GIF Search is not enabled. Please enable it in the config.</center></h1>
`}
</main>`; </main>`;
} }
} }