- Tagesschau-Eilmeldungen portiert

- kleinere Fixes in Google-Images und YouTube-Search

otouto/plugins/gImages.lua

@@ -21,11 +21,10 @@ function gImages:init(config)
 	end
 
 	gImages.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('img', true):t('i', true):t('insfw', true).table
-	gImages.doc = [[```
+	gImages.doc = [[*
-]]..config.cmd_pat..[[img <Suchbegriff>
+]]..config.cmd_pat..[[img* _<Suchbegriff>_
 Sucht Bild mit Google und versendet es (SafeSearch aktiv)
-Alias: ]]..config.cmd_pat..[[i
+Alias: *]]..config.cmd_pat..[[i*]]
-```]]
 end
 
 gImages.command = 'img <Suchbegriff>'

otouto/plugins/tagesschau_eil.lua

@@ -0,0 +1,112 @@
+local tagesschau_eil = {}
+
+local http = require('socket.http')
+local https = require('ssl.https')
+local url = require('socket.url')
+local json = require('dkjson')
+local utilities = require('otouto.utilities')
+local redis = (loadfile "./otouto/redis.lua")()
+
+tagesschau_eil.command = 'eil <sub/del>'
+
+function tagesschau_eil:init(config)
+	tagesschau_eil.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('eil', true).table
+	tagesschau_eil.doc = [[*
+]]..config.cmd_pat..[[eil* _sub_: Eilmeldungen abonnieren
+*]]..config.cmd_pat..[[eil* _del_: Eilmeldungen deabonnieren
+*]]..config.cmd_pat..[[eil* _sync_: Nach neuen Eilmeldungen prüfen (nur Superuser)]]
+end
+
+local makeOurDate = function(dateString)
+  local pattern = "(%d+)%-(%d+)%-(%d+)T(%d+)%:(%d+)%:(%d+)"
+  local year, month, day, hours, minutes, seconds = dateString:match(pattern)
+  return day..'.'..month..'.'..year..' um '..hours..':'..minutes..':'..seconds
+end
+
+local url = 'http://www.tagesschau.de/api'
+local hash = 'telegram:tagesschau'
+
+function tagesschau_eil:abonnieren(id)
+  if redis:sismember(hash..':subs', id) == false then
+    redis:sadd(hash..':subs', id)
+	return '*Eilmeldungen abonniert.*'
+  else
+    return 'Die Eilmeldungen wurden hier bereits abonniert.'
+  end
+end
+
+function tagesschau_eil:deabonnieren(id)
+  if redis:sismember(hash..':subs', id) == true then
+    redis:srem(hash..':subs', id)
+	return '*Eilmeldungen deabonniert.*'
+  else
+    return 'Die Eilmeldungen wurden hier noch nicht abonniert.'
+  end
+end
+
+function tagesschau_eil:action(msg, config)
+  local input = utilities.input(msg.text)
+  
+  if not input then
+    if msg.reply_to_message and msg.reply_to_message.text then
+      input = msg.reply_to_message.text
+    else
+	  utilities.send_message(self, msg.chat.id, tagesschau_eil.doc, true, msg.message_id, true)
+	  return
+	end
+  end
+
+  local id = "user#id" .. msg.from.id
+  if msg.chat.type == 'channel' then
+    print('Kanäle werden momentan nicht unterstützt')
+  end
+  if msg.chat.type == 'group' or msg.chat.type == 'supergroup' then
+    id = 'chat#id'..msg.chat.id
+  end
+
+  if input:match('(sub)$') then
+	local output = tagesschau_eil:abonnieren(id)
+	utilities.send_reply(self, msg, output, true)
+  elseif input:match('(del)$') then
+	local output = tagesschau_eil:deabonnieren(id)
+	utilities.send_reply(self, msg, output, true)
+  elseif input:match('(sync)$') then
+    if msg.from.id ~= config.admin then
+      utilities.send_reply(self, msg, config.errors.sudo)
+	  return
+    end
+	tagesschau_eil:cron(self)
+  end
+  
+  return
+end
+
+function tagesschau_eil:cron(self_plz)
+   if not self.BASE_URL then
+     self = self_plz
+   end
+  -- print('EIL: Prüfe...')
+  local last_eil = redis:get(hash..':last_entry')
+  local res,code  = http.request(url)
+  local data = json.decode(res)
+  if code ~= 200 then return end
+  if not data then return end
+  if data.breakingnews[1] then
+    if data.breakingnews[1].details ~= last_eil then
+      local title = '#EIL: *'..data.breakingnews[1].headline..'*'
+      local news = data.breakingnews[1].shorttext
+      local posted_at = makeOurDate(data.breakingnews[1].date)..' Uhr'
+	  local post_url = string.gsub(data.breakingnews[1].details, '/api/', '/')
+	  local post_url = string.gsub(post_url, '.json', '.html')
+      local eil = title..'\n_'..posted_at..'_\n'..news..'\n[Artikel aufrufen]('..post_url..')'
+      redis:set(hash..':last_entry', data.breakingnews[1].details)
+	  for _,user in pairs(redis:smembers(hash..':subs')) do
+	    local user = string.gsub(user, 'chat%#id', '')
+		local user = string.gsub(user, 'user%#id', '')
+	    utilities.send_message(self, user, eil, true, nil, true)
+      end
+    end
+  end
+end
+
+return tagesschau_eil

otouto/plugins/youtube_search.lua

@@ -17,7 +17,8 @@ function yt_search:init(config)
 	end
 	
 	yt_search.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('yt', true):t('youtube', true).table
-	yt_search.doc = [[*]]..config.cmd_pat..[[yt* _<Suchbegriff>_: Sucht nach einem YouTube-Video]]
+	yt_search.doc = [[*
+]]..config.cmd_pat..[[yt* _<Suchbegriff>_: Sucht nach einem YouTube-Video]]
 end
 
 local BASE_URL = 'https://www.googleapis.com/youtube/v3'