Compare commits
No commits in common. "ffbe4db9227a0d0b266b164e04077a5cc34f0c78" and "802efbe286ac065e817a1968ce2e81cb98200841" have entirely different histories.
ffbe4db922
...
802efbe286
7 changed files with 17 additions and 66 deletions
|
|
@ -1,4 +1,2 @@
|
|||
# Curious-Greg
|
||||
Curious Cat Mastodon crossposter thingy c:
|
||||
it's not done yet uwu
|
||||
|
||||
|
|
|
|||
|
|
@ -7,4 +7,3 @@
|
|||
import requests, sqlite3, json
|
||||
from mastodon import Mastodon
|
||||
|
||||
cfg = json.load(open('meta.json'))
|
||||
|
|
@ -35,6 +35,8 @@ async function ajax(url) { //must be called from an async function! use 'await',
|
|||
|
||||
async function cont() {
|
||||
url = dgel('instance-input').value;
|
||||
j = await ajax('/internal/auth_a?url=' + url)
|
||||
console.log(j)
|
||||
if (url.substr(0,8) != "https://") {
|
||||
url = "https://" + url
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -46,7 +46,6 @@ button {
|
|||
border-radius:2px;
|
||||
padding:10px 25px;
|
||||
transition:0.2s all ease-in;
|
||||
cursor: pointer;
|
||||
}
|
||||
button:hover{
|
||||
background-color:#2b90d9;
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Curious Greg - Home</title>
|
||||
<link rel='stylesheet' type='text/css' href="{{ url_for('static', filename='style.css') }}" />
|
||||
<script type="text/javascript" src="{{ url_for('static', filename='script.js') }}"></script>
|
||||
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<h1>Welcome, {{ acct }}</h1>
|
||||
<h2>You're all set up and ready to go.</h2>
|
||||
<noscript>
|
||||
Curious Greg will not function without JavaScript. Please ensure you have JavaScript enabled.
|
||||
</noscript>
|
||||
<!-- <div id='logo-main'></div> -->
|
||||
<div id='body'>
|
||||
You haven't posted to Curious Cat in a while, so we'll wait <em>14 minutes</em> until we check for new answers.
|
||||
</div>
|
||||
<div id='footer'>
|
||||
Note that Curious Greg requires first-party cookies to be enabled. You may safely delete the cookie upon completing the connection process.<br />
|
||||
Curious Greg will not function without JavaScript. Please ensure you have JavaScript enabled.
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -9,9 +9,6 @@
|
|||
<body>
|
||||
<h1>Curious Greg</h1>
|
||||
<h2>Connect your Curious Cat and Mastodon accounts for automated crossposting.</h2>
|
||||
<noscript>
|
||||
Curious Greg will not function without JavaScript. Please ensure you have JavaScript enabled.
|
||||
</noscript>
|
||||
<!-- <div id='logo-main'></div> -->
|
||||
<form onsubmit='cont(); return false'>
|
||||
<label for='instance'>Instance URL</label><br />
|
||||
|
|
@ -19,8 +16,7 @@
|
|||
<button class='loading'>Continue</button>
|
||||
</form>
|
||||
<div id='footer'>
|
||||
Note that Curious Greg requires first-party cookies to be enabled. You may safely delete the cookie upon completing the connection process.<br />
|
||||
Curious Greg will not function without JavaScript. Please ensure you have JavaScript enabled.
|
||||
Note that Curious Greg requires first-party cookies to be enabled. You may safely delete the cookie upon completing the connection process.
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
41
web.py
41
web.py
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
import requests, sqlite3, json
|
||||
from mastodon import Mastodon
|
||||
from flask import Flask, render_template, request, session, redirect, url_for
|
||||
from flask import Flask, render_template
|
||||
|
||||
cfg = json.load(open("meta.json"))
|
||||
|
||||
|
|
@ -17,45 +17,26 @@ c.execute("CREATE TABLE IF NOT EXISTS `data` (username VARCHAR NOT NULL, appid V
|
|||
app = Flask(cfg['name'])
|
||||
app.secret_key = cfg['flask_key']
|
||||
|
||||
|
||||
@app.route('/')
|
||||
def main():
|
||||
if 'acct' not in session:
|
||||
return render_template("landing_page.html")
|
||||
else:
|
||||
return redirect(url_for('home'))
|
||||
|
||||
@app.route('/home')
|
||||
def home():
|
||||
return render_templae("home.html")
|
||||
|
||||
@app.route('/internal/auth_a')
|
||||
def internal_auth_a():
|
||||
|
||||
client_id = "abc"
|
||||
client_secret = "123"
|
||||
instance_url = request.args.get('url', default='mastodon.social', type=str)
|
||||
if not instance_url.startswith("https://"):
|
||||
instance_url = "https://{}".format(instance_url)
|
||||
|
||||
# client_id, client_secret = Mastodon.create_app(cfg['name'],
|
||||
# api_base_url=instance_url,
|
||||
# scopes="write:statuses",
|
||||
# website=cfg['website'])
|
||||
|
||||
#example URL:
|
||||
#https://fedi.lynnesbian.space/oauth/authorize?scope=read:favourites&response_type=code&redirect_uri=https://t5.codesections.com&client_id=CLIENT_ID_HERE&client_secret=CLIENT_SECRET_HERE
|
||||
client_id = "abc"
|
||||
client_secret = "123"
|
||||
|
||||
# client_info = {
|
||||
# "client_id": client_id,
|
||||
# "client_secret":client_secret,
|
||||
# "scopes":"write:statuses",
|
||||
# "website": cfg['website']
|
||||
# }
|
||||
client_info = {
|
||||
"client_id": client_id,
|
||||
"client_secret":client_secret,
|
||||
"scopes":"write:statuses",
|
||||
"website": cfg['website']
|
||||
}
|
||||
|
||||
url = "{}/oauth/authorize?scope=write:statuses&response_type=code&redirect_url=https://lynnesbian.space/cg/internal/auth_b&client_id={}&client_secret={}".format(
|
||||
instance_url, client_id, client_secret
|
||||
)
|
||||
|
||||
return url
|
||||
|
||||
# return(json.dumps(client_info))
|
||||
return(json.dumps(client_info))
|
||||
|
|
|
|||
Loading…
Reference in a new issue