src/joann-pupper-bot.cr

@@ -38,7 +38,7 @@ end
 
 spawn do
     loop do
-        time = Time.local
+        time = Time.now
         url_tuple = get_reddit_post(subreddit, completed) if (active_hours.includes? time.hour)
         if url_tuple
             url, title = url_tuple

src/joann-pupper-bot/reddit.cr

@@ -1,60 +1,27 @@
 require "http/client"
 require "json" 
 
-class RedditWrapper(T)
+def get_reddit_json(subreddit)
-  JSON.mapping(
+    request_url = "https://www.reddit.com/r/#{subreddit}/hot.json?limit=30"
-    kind: String,
-    data: T)
-end
-
-class RedditChild
-  JSON.mapping(
-    url: String,
-    name: String,
-    title: String)
-end
-
-class RedditResponse
-  JSON.mapping(
-    modhash: String,
-    dist: Int32,
-    children: Array(RedditWrapper(RedditChild)))
-
-  def self.from_subreddits(subreddits : Array(String))
-    request_url = URI.new scheme: "https", host: "www.reddit.com", path: "/r/hot.json", query: "limit=30"
     response = HTTP::Client.get(request_url, headers: HTTP::Headers {
         "User-agent" => "Joann-Pupper-Bot"
     })
-
+    response.body?.try { |body| JSON.parse(body) }
-    return nil unless body = response.body?
-
-    begin
-      RedditWrapper(RedditResponse).from_json body
-    rescue
-      nil
-    end
 end
 
-  def self.from_subreddit(subreddit)
+def filter_reddit_json(json, completed)
-    from_subreddits [subreddit]
+    json["data"]["children"]
-  end
+        .as_a
-
+        .map(&.["data"])
-  def posts_matching(&block)
+        .select do |it| 
-    children
+            url = it["url"].as_s
-      .map(&.data)
+            name = it["name"].as_s
-      .select { |it| yield it }
+            !completed.includes?(name) && (url.ends_with?(".png") || url.ends_with?(".jpg"))
-  end
-end
-
-def filter_reddit_json(json, completed, extensions = ["png", "json"])
-  json.data.posts_matching do |post|
-    extensions.any? { |it| post.url.ends_with? it } && !completed.includes? post.url
         end
 end
 
 def get_reddit_post(subreddit, completed)
-    return nil unless json = RedditResponse.from_subreddit subreddit
+    json = get_reddit_json(subreddit)
-    return nil unless post = filter_reddit_json(json, completed).first?
+    post = json.try { |json| filter_reddit_json(json, completed).first? }
-    completed.push(post.name)
+    post.try { |post| completed.push(post["name"].as_s); { post["url"].as_s, post["title"].as_s } }
-    return { post.url, post.title }
 end