Merge pull request #7 from julianorchard/feat-config-file

feat: add ntfy-topic to config, close #5
julianorchard · Jul 6, 2023 · afe349d · afe349d
2 parents bbed41c + 23c029a
commit afe349d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 30 deletions.
diff --git a/config.yaml b/config.yaml
@@ -2,19 +2,23 @@ nitter:
   service: nitter
   rss-url: https://uk.unofficialbird.com/{{ custom }}/rss
   descriptor: 🐦 Tweet
+  ntfy-topic: nitter-rss-ntfy-test
 
 proxitok:
   service: proxitok
   rss-url: https://proxitok.pabloferreiro.es/@{{ custom }}/rss
   descriptor: 🎶 TikTok
+  ntfy-topic: proxitok-rss-ntfy-test
 
 invidious:
   service: invidious
   rss-url: https://invidious.snopyta.org/feed/channel/{{ custom }}
   descriptor: 📽 YouTube video
+  ntfy-topic: invidious-rss-ntfy-test
 
 teddit:
   service: teddit
   rss-url: https://teddit.net/r/{{ custom }}?api&type=rss
   descriptor: 🎩 Reddit post
+  ntfy-topic: teddit-rss-ntfy-test
 
diff --git a/rss-ntfy.py b/rss-ntfy.py
@@ -27,6 +27,7 @@
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) + "/rss-ntfy/"
 with open("config.yaml", "r") as config_file_contents:
     CONFIG = yaml.safe_load(config_file_contents)
+# TODO: This could also be abstracted to the config file, with a default value
 NTFY_INSTANCE = "https://ntfy.sh/"
 
 
@@ -106,7 +107,7 @@ def main():
 
         # Instance, Topic, Descriptor
         instance    = f"{CONFIG[service_name]['rss-url']}"
-        ntfy_topic  = f"{CONFIG[service_name]['service']}-jdo-personal"
+        ntfy_topic  = f"{CONFIG[service_name]['ntfy-topic']}"
         descriptor  = CONFIG[service_name]['descriptor']
 
         # Alternative Tags Input

diff --git a/rss-ntfy/teddit_hist b/rss-ntfy/teddit_hist
@@ -1,32 +1,3 @@
-https://teddit.net/r/funny/comments/uq9pjw/going_forward_comics_may_only_be_posted_on/
-https://teddit.net/r/funny/comments/10qqy3c/subreddit_of_the_month_february_2023/
-https://teddit.net/r/funny/comments/10s9i7j/my_wife_and_her_class_made_ground_hogs_i_cant/
-https://teddit.net/r/funny/comments/10s4s8a/what_am_i_looking_at/
-https://teddit.net/r/funny/comments/10rw2oj/pain_of_labor/
-https://teddit.net/r/funny/comments/10rt8k3/i_hope_the_texas_police_understand_why_i_didnt/
-https://teddit.net/r/funny/comments/10rwu8o/i_wouldnt_want_cootie_juices_on_my_dishes_either/
-https://teddit.net/r/funny/comments/10s97l6/you_had_one_job/
-https://teddit.net/r/funny/comments/10s9ic7/please_hold_my_hand_while_i_fart/
-https://teddit.net/r/funny/comments/10rvtxc/went_for_my_morning_movement_at_work_some_new_art/
-https://teddit.net/r/funny/comments/10sag0t/was_watching_groundhog_day_when/
-https://teddit.net/r/funny/comments/10rvzee/ais_attempt_at_a_sign_language_guide/
-https://teddit.net/r/funny/comments/10ry3n1/i_was_on_a_game_show_last_year_but_couldnt_tell/
-https://teddit.net/r/funny/comments/10rp5en/everyone_will_hear_her_coming/
-https://teddit.net/r/funny/comments/10s3vzl/pastor_falls_for_prank_callers_trap_live_on_air/
-https://teddit.net/r/funny/comments/10rzy9y/the_all_seeing_cats/
-https://teddit.net/r/funny/comments/10rz513/good_boi/
-https://teddit.net/r/funny/comments/10rqtkd/dont_drink_and/
-https://teddit.net/r/funny/comments/10shs45/china_rn/
-https://teddit.net/r/funny/comments/10sdwq7/out_of_hundreds_of_fake_tattoos_my_daughter_could/
-https://teddit.net/r/funny/comments/10rwshn/turn_back_to_me_playing_a_gig_in_2007_didnt_have/
-https://teddit.net/r/funny/comments/10sap3s/these_ubereats_ads_are_getting_out_of_hand/
-https://teddit.net/r/funny/comments/10sixxl/this_made_me_laugh_out_loud/
-https://teddit.net/r/funny/comments/10s1oeo/found_this_gem_on_facebook_marketplace/
-https://teddit.net/r/funny/comments/10s3ges/cannot_unsee/
-https://teddit.net/r/funny/comments/10rtrkp/safety_first_no_bringing_your_batarangs_on_the/
-https://teddit.net/r/funny/comments/10s8yl9/i_rate_this_hinge_video_prompt_300/
-https://teddit.net/r/funny/comments/1149u43/they_used_this_picture_at_work_today_to_see_if_we/
-https://teddit.net/r/funny/comments/114edzg/my_wife_asked_me_to_buy_medium_sized_cucumbers/
 https://teddit.net/r/funny/comments/114758v/hes_either_illiterate_or_has_no_regard_for_the_law/
 https://teddit.net/r/funny/comments/113ufju/my_social_security_was_canceled/
 https://teddit.net/r/funny/comments/1140y0j/got_a_vasectomy_today_my_wife_got_me_get_well/
@@ -79,3 +50,6 @@ https://teddit.net/r/funny/comments/14ruitt/my_friends_delivery_arrived_while_sh
 https://teddit.net/r/funny/comments/14sn87b/i_think_ill_avoid_the_office_microwave_today/
 https://teddit.net/r/funny/comments/14seai5/satan_is_jealous_of_my_limousine/
 https://teddit.net/r/funny/comments/14rt600/dont_woof/
+https://teddit.net/r/funny/comments/14sm648/i_sent_this_cute_pic_in_my_family_group_text/
+https://teddit.net/r/funny/comments/14snbh4/will_definitely_try_it/
+https://teddit.net/r/funny/comments/14rf42n/my_sons_assignment_was_what_is_a_scientist_i_used/