Add a shards.lock and use HTTPs for new telepathy

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>

shard.lock

@@ -0,0 +1,22 @@
+version: 2.0
+shards:
+  cron_parser:
+    git: https://github.com/kostya/cron_parser.git
+    version: 0.4.0
+
+  cron_scheduler:
+    git: https://github.com/kostya/cron_scheduler.git
+    version: 0.4.0
+
+  db:
+    git: https://github.com/crystal-lang/crystal-db.git
+    version: 0.14.0
+
+  sqlite3:
+    git: https://github.com/crystal-lang/crystal-sqlite3.git
+    version: 0.22.0
+
+  telepathy:
+    git: https://dev.danilafe.com/Crystal-Bots/telepathy
+    version: 0.2.0
+

shard.yml

@@ -16,6 +16,6 @@ dependencies:
   sqlite3:
     github: crystal-lang/crystal-sqlite3
 
-crystal: 0.24.1
+crystal: 1.0.0
 
 license: MIT

src/joann-pupper-bot/bot.cr

@@ -1,18 +1,18 @@
-require "logger"
+require "log"
 require "telepathy"
 require "time"
 require "sqlite3"
 require "cron_scheduler"
 
 EXTENSIONS = ["png", "jpeg", "jpg"]
-LOGGER = Logger.new(STDOUT)
+LOGGER = Log.for("joann-pupper-bot")
 
 class PupperBot
    @db : DB::Database
 
   def initialize(@configuration : BotConfiguration)
-    @telegram_bot = Telepathy::Bot.new configuration.token
+    @telegram_bot = Telepathy::Bot.new @configuration.token
-    @db = DB.open "sqlite3://#{configuration.database}"
+    @db = DB.open "sqlite3://#{@configuration.database}"
     initialize_db
     update_database
     initialize_timers
@@ -49,12 +49,12 @@ class PupperBot
     unsent_query = "select id, title, url from posts where not exists (select * from recepient_posts where recepient=? and post=id) limit 1"
 
     unless to_send = @db.query_one? unsent_query, chatid, as: { Int64, String, String }
-      LOGGER.info "Unable to find a post to send to #{chatid}."
+      LOGGER.info { "Unable to find a post to send to #{chatid}." }
       return
     end
 
     id, title, url = to_send
-    LOGGER.info "Using URL #{url} for request from #{chatid}"
+    LOGGER.info { "Using URL #{url} for request from #{chatid}" }
     @db.exec "insert into recepient_posts(recepient, post) values(?, ?)", chatid, id
     @telegram_bot.send_photo(chatid, url, title)
   end
@@ -67,13 +67,13 @@ class PupperBot
 
   def update_database
     unless response = RedditResponse.from_subreddits(@configuration.subreddits)
-      LOGGER.info "Unable to find more posts for the database"
+      LOGGER.info { "Unable to find more posts for the database" }
       return
     end
 
     posts = response.data.posts_matching { |post| EXTENSIONS.any? { |it| post.url.ends_with? it } }
     posts.each do |post|
-      LOGGER.info "Trying to save post #{post.title} #{post.url}"
+      LOGGER.info { "Trying to save post #{post.title} #{post.url}" }
       begin
         @db.exec "insert into posts(title, url) values(?, ?)", post.title, post.url
       rescue

src/joann-pupper-bot/config.cr

@@ -1,11 +1,23 @@
 require "yaml"
 
 class BotConfiguration
-  YAML.mapping(
+  include YAML::Serializable
-    token: String,
+
-    database: { type: String, default: "./data.sqlite" },
+  @[YAML::Field(key: "token")]
-    subreddits: { type: Array(String), default: [ "rarepuppers" ] },
+  property token : String
-    send_cron: { type: String, default: "*/30 8-21 * * *" },
+
-    refresh_cron: { type: String, default: "*/15 * * * *" },
+  @[YAML::Field(key: "database")]
-    recipients: Array(Int64))
+  property database : String = "./data.sqlite"
+
+  @[YAML::Field(key: "subreddits")]
+  property subreddits : Array(String) = ["rarepuppers"]
+
+  @[YAML::Field(key: "send_cron")]
+  property send_cron : String = "*/30 8-21 * * *"
+
+  @[YAML::Field(key: "refresh_cron")]
+  property refresh_cron : String = "*/15 * * * *"
+
+  @[YAML::Field(key: "recipients")]
+  property recipients : Array(Int64)
 end

src/joann-pupper-bot/reddit.cr

@@ -2,23 +2,39 @@ require "http/client"
 require "json"
 
 class RedditWrapper(T)
-  JSON.mapping(
+  include JSON::Serializable
-    kind: String,
+
-    data: T)
+  @[JSON::Field(key: "kind")]
+  property kind : String
+
+  @[JSON::Field(key: "data")]
+  property data : T
 end
 
 class RedditChild
-  JSON.mapping(
+  include JSON::Serializable
-    url: String,
+
-    name: String,
+  @[JSON::Field(key: "url")]
-    title: String)
+  property url : String
+
+  @[JSON::Field(key: "name")]
+  property name : String
+
+  @[JSON::Field(key: "title")]
+  property title : String
 end
 
 class RedditResponse
-  JSON.mapping(
+  include JSON::Serializable
-    modhash: String,
+
-    dist: Int32,
+  @[JSON::Field(key: "modhash")]
-    children: Array(RedditWrapper(RedditChild)))
+  property modhash : String
+
+  @[JSON::Field(key: "dist")]
+  property dist : Int32
+
+  @[JSON::Field(key: "children")]
+  property children : Array(RedditWrapper(RedditChild))
 
   def self.from_subreddits(subreddits : Array(String))
     request_url = URI.new scheme: "https", host: "www.reddit.com", path: "/r/#{subreddits.join "+"}/hot.json", query: "limit=30"