.gitignore

@@ -1,5 +1,3 @@
-config.json
-
 # ---> Python
 # Byte-compiled / optimized / DLL files
 __pycache__/

config.json.sample

@@ -1,3 +0,0 @@
-{
-	"site":"fedi.lynnesbian.space"
-}

login.py

@@ -1,28 +0,0 @@
-import json
-from mastodon import Mastodon
-
-scopes = ["read:statuses", "read:accounts", "read:follows", "write:statuses"]
-cfg = json.load(open('config.json', 'r'))
-
-if "client" not in cfg:
-	print("No client credentials, registering application")
-	client_id, client_secret = Mastodon.create_app("lynnegle-assistant",
-		api_base_url=cfg['site'],
-		scopes=scopes,
-		website="https://git.lynnesbian.space/lynnesbian/lynnegle-assistant")
-
-	cfg['client'] = {
-		"id": client_id,
-		"secret": client_secret
-	}
-
-if "secret" not in cfg:
-	print("No user credentials, logging in")
-	client = Mastodon(client_id = cfg['client']['id'],
-		client_secret = cfg['client']['secret'],
-		api_base_url=cfg['site'])
-
-	print("Open this URL: {}".format(client.auth_request_url(scopes=scopes)))
-	cfg['secret'] = client.log_in(code=input("Secret: "), scopes=scopes)
-
-json.dump(cfg, open("config.json", "w+"))

main.py

@@ -1,52 +1,35 @@
 #!/usr/bin/env python3
-
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
 import requests
 from mastodon import Mastodon
 import json
 
+scopes = ["read:statuses", "read:accounts", "read:follows", "write:statuses"]
 cfg = json.load(open('config.json', 'r'))
 
-client = Mastodon(
+if "client" not in cfg:
-	client_id=cfg['client']['id'],
+	print("No client credentials, registering application")
+	client_id, client_secret = Mastodon.create_app("lynnegle-assistant",
+		api_base_url=cfg['site'],
+		scopes=scopes,
+		website="https://github.com/Lynnesbian/mstdn-ebooks")
+
+	cfg['client'] = {
+		"id": client_id,
+		"secret": client_secret
+	}
+
+if "secret" not in cfg:
+	print("No user credentials, logging in")
+	client = Mastodon(client_id = cfg['client']['id'],
 		client_secret = cfg['client']['secret'],
-	access_token=cfg['secret'], 
 		api_base_url=cfg['site'])
 
-def extract_toot(toot):
+	print("Open this URL: {}".format(client.auth_request_url(scopes=scopes)))
-	#copied from main.py, see there for comments
+	cfg['secret'] = client.log_in(code=input("Secret: "), scopes=scopes)
-	soup = BeautifulSoup(toot, "html.parser")
-	for lb in soup.select("br"):
-		lb.insert_after("\n")
-		lb.decompose()
-	for p in soup.select("p"):
-		p.insert_after("\n")
-		p.unwrap()
-	for ht in soup.select("a.hashtag"):
-		ht.unwrap()
-	for link in soup.select("a"):
-		link.insert_after(link["href"])
-		link.decompose()
-	text = map(lambda a: a.strip(), soup.get_text().strip().split("\n"))
-	text = "\n".join(list(text))
-	text = re.sub("https?://([^/]+)/(@[^ ]+)", r"\2@\1", text) #put mentions back in
-	text = re.sub("^@[^@]+@[^ ]+ *", r"", text) #...but remove the initial one
-	text = text.lower() #for easier matching
-	return text
 
-class ReplyListener(mastodon.StreamListener):
+json.dump(cfg, open("config.json", "w+"))
-	def on_notification(self, notification):
-		if notification['type'] == 'mention':
-			acct = "@" + notification['account']['acct']
-			post_id = notification['status']['id']
-			mention = extract_toot(notification['status']['content'])
-			print(acct + " says " + mention)
 
-			kind = 'general' #todo: support for images
+kind = 'general'
 if kind == 'images':
 	r = requests.get("https://searx.lynnesbian.space/?category_images=1&q={}&format=json".format(q))
 else:
@@ -54,14 +37,9 @@ class ReplyListener(mastodon.StreamListener):
 j = r.json()
 
 if kind == 'images':
-				toot = "Here's what I found by searching for images with the query \"{}\".".format(q)
+	text = "Here's what I found by searching for images with the query \"{}\".".format(q)
 else:
 	result = j['results'][0]
-				toot = result['title'] + "\n" + result['url'] + "\n" + result['content'] + "\n" + "(Score: {})\nMore results: {}{}".format(result['score'], "https://searx.lynnesbian.space/?q=", q)
+	text = result['title'] + "\n" + result['url'] + "\n" + result['content'] + "\n" + "(Score: {})".format(result['score'])
 
-			toot = acct + " " + toot
+print(text)
-			visibility = notification['status']['visibility']
-			if visibility == "public":
-				visibility = "unlisted"
-			client.status_post(toot, post_id, visibility=visibility)
-			print("replied with " + toot)