Merge pull request #68 from fnic-lemmy/github-issues

Raise GitHub issue when discover_community fails
Fixes #66

Author: chris-y

bestof.py

@@ -13,6 +13,7 @@
 import requests
 import urllib.parse
 import datetime
+import issues
 from urllib.parse import urlparse
 from pythorhead import Lemmy
 from pythorhead.types import SortType
@@ -99,7 +100,7 @@ def gen_shield(c):
   return f'![{serv}](https://img.shields.io/{serv}/{cenc}?style=flat&label=Subs&color=pink)'
 
 
-def run(user, pw, instance, postcomm, cfg, post_title, images_only, nsfw_b, moduser, modpw, rapidkey):
+def run(user, pw, instance, postcomm, cfg, post_title, images_only, nsfw_b, moduser, modpw, rapidkey, ghtoken, ghrepo):
   topposts = 0
   toppost = []
 
@@ -137,6 +138,10 @@ def run(user, pw, instance, postcomm, cfg, post_title, images_only, nsfw_b, modu
       community_id = lemmy.discover_community(comm)
     except Exception as e:
       print(f'discover {comm} failed: {e}\n')
+      try:
+        issues.raise_issue(ghtoken, ghrepo, f'Remove {comm}', f'discover_community returned:\n\n```\n{e}\n```\n')
+      except Exception as ghe:
+        print(f'error raising github issue: {ghe}\n')
       continue # skip communities we can't find
 
     if community_id is not None:

deploy.sh

@@ -4,12 +4,12 @@ region="europe-west1"
 comm="[email protected]"
 mod_user="fnicmodbot"
 mod_pw="fnicmodbot-dbzer0:latest"
-gist="94127e24dc129210db8dfb819dd8d6b1"
-ghtoken="gh-fnic-bot-gist:latest"
+ghrepo="fnic-lemmy/bestofbot"
+ghtoken="fnic-bot-issues:latest"
 nsfw="2"
 
 gc_deploy() {
-  gcloud run jobs deploy bestofbot-$4 --project=$project --region=$region --source . --set-env-vars=BOTUSER="best_of_$1_bot",BOTINSTANCE="lemmy.dbzer0.com",COMMUNITY="$comm",COMMLIST="configs/$4.json",MODUSER="$mod_user",IMAGES_ONLY=$2,NSFW_BEHAVIOUR=$5,GIST=$gist,POSTTITLE="$3" --set-secrets="BOTPW=best_of_$1_bot:latest,MODPW=$mod_pw,GHTOKEN=$ghtoken,TLDRTHIS_API=rapidapi:latest" &
+  gcloud run jobs deploy bestofbot-$4 --project=$project --region=$region --source . --set-env-vars=BOTUSER="best_of_$1_bot",BOTINSTANCE="lemmy.dbzer0.com",COMMUNITY="$comm",COMMLIST="configs/$4.json",MODUSER="$mod_user",IMAGES_ONLY=$2,NSFW_BEHAVIOUR=$5,GHREPO="$ghrepo",POSTTITLE="$3" --set-secrets="BOTPW=best_of_$1_bot:latest,MODPW=$mod_pw,GHTOKEN=$ghtoken,TLDRTHIS_API=rapidapi:latest" &
 }
 
 gc_deploy_quick() {
@@ -41,5 +41,5 @@ gc_deploy "memes" "1" "❗Top Memes (Shows) posts of the month❗" "memes-shows"
 gc_deploy "memes" "1" "❗Top Memes (Games) posts of the month❗" "memes-games" "$nsfw"
 gc_deploy "memes" "1" "❗Top Memes (Social Media) posts of the month❗" "memes-social" "$nsfw"
 
-gcloud run jobs deploy bestofbot-anime --project=$project --region=$region --source . --set-env-vars=BOTUSER="moebot",BOTINSTANCE="ani.social",COMMUNITY="$comm",COMMLIST="configs/anime.json",IMAGES_ONLY=1,NSFW_BEHAVIOUR=1,GIST=$gist,POSTTITLE="💢❗Top Anime Art posts of the month❗💢" --set-secrets="BOTPW=moebot:latest,GHTOKEN=$ghtoken" &
+gcloud run jobs deploy bestofbot-anime --project=$project --region=$region --source . --set-env-vars=BOTUSER="moebot",BOTINSTANCE="ani.social",COMMUNITY="$comm",COMMLIST="configs/anime.json",IMAGES_ONLY=1,NSFW_BEHAVIOUR=1,GHREPO="$ghrepo",POSTTITLE="💢❗Top Anime Art posts of the month❗💢" --set-secrets="BOTPW=moebot:latest,GHTOKEN=$ghtoken" &
 wait

issues.py

@@ -0,0 +1,19 @@
+#!/usr/bin/python3
+from github import Github
+from github import Auth
+from github import Repository
+
+def raise_issue(ghtoken, ghrepo, title, desc):
+
+  auth = Auth.Token(ghtoken)
+  g = Github(auth=auth)
+  repo = g.get_repo(ghrepo)
+  my_issues = repo.get_issues(state = "open", creator = "fnic-bot")
+  for issue in my_issues:
+    print(issue)
+    if issue.title == title:
+      print('already raised')
+      issue.create_comment(f'This has failed again.\n\n{desc}')
+      return
+
+  i = repo.create_issue(title = title, body = desc, labels = [repo.get_label(name = "community")])

main.py

@@ -16,26 +16,26 @@
 NSFW = os.getenv("NSFW_BEHAVIOUR", 0)
 MODUSER = os.getenv("MODUSER",0)
 MODPW = os.getenv("MODPW", 0)
-GIST = os.getenv("GIST", 0)
+GHREPO = os.getenv("GHREPO", 0)
 GHTOKEN = os.getenv("GHTOKEN", 0)
 TLDRTHIS_APIKEY = os.getenv("TLDRTHIS_API", 0)
 
-def main(user, pw, inst, comm, cfg, title, imgs, nsfw, moduser, modpw, gist, ghtoken, tldr_api):
+def main(user, pw, inst, comm, cfg, title, imgs, nsfw, moduser, modpw, ghrepo, ghtoken, tldr_api):
 
     io = False
 
     if imgs == 1:
       io = True
 
-    contents = bestof.run(user, pw, inst, comm, cfg, title, io, nsfw, moduser, modpw, tldr_api)
+    contents = bestof.run(user, pw, inst, comm, cfg, title, io, nsfw, moduser, modpw, tldr_api, ghtoken, ghrepo)
 
     return "bestofbot"
 
 # Start script
 if __name__ == "__main__":
     try:
         main(BOTUSER, BOTPW, BOTINSTANCE, POSTCOMMUNITY, COMMUNITIES, TITLE,
-             int(IMAGESONLY), int(NSFW), MODUSER, MODPW, GIST, GHTOKEN, TLDRTHIS_APIKEY)
+             int(IMAGESONLY), int(NSFW), MODUSER, MODPW, GHREPO, GHTOKEN, TLDRTHIS_APIKEY)
     except Exception as err:
         message = (
             f"Task #{TASK_INDEX}, " + f"Attempt #{TASK_ATTEMPT} failed: {str(err)}"

requirements.txt

@@ -1,5 +1,5 @@
 pythorhead==0.25.0
-PyGithub==2.3.0
+PyGithub==2.6.0
 requests
 smmrpy
 aiohttp