- gImages: Stark verbessert, keine Code-Duplikation mehr + Bilder werden nicht mehr heruntergeladen, sondern direkt an den TG-Server gesendet (3. Oktober Update)

- Einige Plugins nutzen jetzt Bilder-URLs, anstatt die Datei selbst herunterzuladen (3. Oktober Update)

otouto/plugins/9gag.lua

@@ -53,8 +53,7 @@ function ninegag:action(msg, config)
 	return
   end
 
-  local file = download_to_file(url)
+  utilities.send_photo(msg.chat.id, url, title, msg.message_id, '{"inline_keyboard":[[{"text":"Post aufrufen","url":"'..post_url..'"}]]}')
-  utilities.send_photo(msg.chat.id, file, title, msg.message_id, '{"inline_keyboard":[[{"text":"Post aufrufen","url":"'..post_url..'"}]]}')
 end
 
 return ninegag

otouto/plugins/ap.lua

@@ -30,8 +30,7 @@ function ap:action(msg, config, matches)
   
   if pic then
     local pic = pic:gsub('-small', '-big')
-    local photo = download_to_file('http://hosted.ap.org'..pic)
+    utilities.send_photo(msg.chat.id, 'http://hosted.ap.org'..pic, nil, msg.message_id)
-    utilities.send_photo(msg.chat.id, photo, nil, msg.message_id)
   end
   utilities.send_reply(msg, article, 'HTML')
 end

otouto/plugins/app_store.lua

@@ -103,8 +103,7 @@ function app_store:action(msg, config, matches)
     utilities.send_reply(msg, output, 'HTML')
 	if image_url then
 	  utilities.send_typing(msg.chat.id, 'upload_photo')
-	  local file = download_to_file(image_url)
+	  utilities.send_photo(msg.chat.id, image_url, nil, msg.message_id)
-	  utilities.send_photo(msg.chat.id, file, nil, msg.message_id)
 	end
   end
 end

otouto/plugins/br.lua

@@ -36,8 +36,7 @@ function br:action(msg, config, matches)
   local text, image_url = br:get_br_article(article)
   if image_url then
     utilities.send_typing(msg.chat.id, 'upload_photo')
-    local file = download_to_file(image_url, 'br_teaser.jpg')
+    utilities.send_photo(msg.chat.id, image_url, nil, msg.message_id)
-    utilities.send_photo(msg.chat.id, file, nil, msg.message_id)
   end
   utilities.send_reply(msg, text, true)
 end

otouto/plugins/gImages.lua

@@ -36,85 +36,6 @@ function gImages:is_blacklisted(msg)
   return var
 end
 
--- Yes, the callback is copied from below, but I can't think of another method :\
-function gImages:callback(callback, msg, self, config, input)
-  if not msg then return end
-  utilities.answer_callback_query(callback, 'Suche nochmal nach "'..URL.unescape(input)..'"')
-  utilities.send_typing(msg.chat.id, 'upload_photo')
-  local hash = 'telegram:cache:gImages'
-  local results = redis:smembers(hash..':'..string.lower(URL.unescape(input)))
-  
-  if not results[1] then
-    print('doing web request')
-    results = gImages:get_image(input)
-	if results == 403 then
-	  utilities.send_reply(msg, config.errors.quotaexceeded, true)
-	  return
-    elseif not results then
-      utilities.send_reply(msg, config.errors.results, true)
-	  return
-    end
-    gImages:cache_result(results, input)
-  end
-
-  -- Random image from table
-  local i = math.random(#results)
-  
-  -- Thanks to Amedeo for this!
-  local failed = true
-  local nofTries = 0
-  
-  while failed and nofTries < #results do
-    if results[i].image then
-      img_url = results[i].link
-      mimetype = results[i].mime
-      context = results[i].image.contextLink
-    else -- from cache
-      img_url = results[i]
-	  mimetype = redis:hget(hash..':'..img_url, 'mime')
-	  context = redis:hget(hash..':'..img_url, 'contextLink')
-    end
-
-    -- It's important to save the image with the right ending!
-    if mimetype == 'image/gif' then
-      file = download_to_file(img_url, 'img.gif')
-    elseif mimetype == 'image/png' then
-     file = download_to_file(img_url, 'img.png')
-    elseif mimetype == 'image/jpeg' then
-      file = download_to_file(img_url, 'img.jpg')
-    else
-      file = nil
-    end
-	
-	if not file then
-	  nofTries = nofTries + 1
-	  i = i+1
-	  if i > #results then
-	    i = 1
-	  end
-	else
-	  failed = false
-	end
-
-  end
-  
-  if failed then
-    utilities.send_reply(msg, 'Fehler beim Herunterladen eines Bildes.', true)
-	return
-  end
-  
-  if mimetype == 'image/gif' then
-    result = utilities.send_document(msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..input..'"}]]}')
-  else
-    result = utilities.send_photo(msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..input..'"}]]}')
-  end
-
-  if not result then
-    utilities.send_reply(msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"gImages:'..input..'"}]]}')
-	return
-  end
-end
-
 function gImages:get_image(input)
   local apikey = cred_data.google_apikey -- 100 requests is RIDICULOUS, Google!
   local cseid = cred_data.google_cse_id
@@ -151,23 +72,7 @@ function gImages:cache_result(results, text)
   cache_data('gImages', string.lower(text), cache, 1209600, 'set')
 end
 
-function gImages:action(msg, config, matches)
+function gImages:send_image(msg, input)
-  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(msg.chat.id, gImages.doc, true, msg.message_id, true)
-	  return
-	end
-  end
-  
-  print ('Checking if search contains blacklisted word: '..input)
-  if gImages:is_blacklisted(input) then
-    utilities.send_reply(msg, 'Vergiss es! ._.')
-	return
-  end
-
   utilities.send_typing(msg.chat.id, 'upload_photo')
 
   local hash = 'telegram:cache:gImages'
@@ -204,18 +109,15 @@ function gImages:action(msg, config, matches)
 	  context = redis:hget(hash..':'..img_url, 'contextLink')
     end
 
-    -- It's important to save the image with the right ending!
     if mimetype == 'image/gif' then
-      file = download_to_file(img_url, 'img.gif')
+      res = utilities.send_document(msg.chat.id, img_url, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
-    elseif mimetype == 'image/png' then
+    elseif mimetype == 'image/png' or mimetype == 'image/jpeg' then
-     file = download_to_file(img_url, 'img.png')
+      res = utilities.send_photo(msg.chat.id, img_url, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
-    elseif mimetype == 'image/jpeg' then
-      file = download_to_file(img_url, 'img.jpg')
     else
-      file = nil
+      res = nil
     end
 	
-	if not file then
+	if not res then
 	  nofTries = nofTries + 1
 	  i = i+1
 	  if i > #results then
@@ -231,17 +133,38 @@ function gImages:action(msg, config, matches)
     utilities.send_reply(msg, 'Fehler beim Herunterladen eines Bildes.', true)
 	return
   end
+end
 
-  if mimetype == 'image/gif' then
+function gImages:callback(callback, msg, self, config, input)
-    result = utilities.send_document(msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
+  if not msg then return end
+  local input = URL.unescape(input)
+  if gImages:is_blacklisted(input) then
+    utilities.answer_callback_query(callback, 'Wort steht auf der Blacklist!', true)
+	return
   else
-    result = utilities.send_photo(msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
+    utilities.answer_callback_query(callback, 'Suche nochmal nach "'..input..'"')
   end
+  gImages:send_image(msg, input)
+end
 
-  if not result then
+function gImages:action(msg, config, matches)
-    utilities.send_reply(msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
+  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(msg.chat.id, gImages.doc, true, msg.message_id, true)
 	  return
 	end
+  end
+  
+  print ('Checking if search contains blacklisted word: '..input)
+  if gImages:is_blacklisted(input) then
+    utilities.send_reply(msg, 'Vergiss es! ._.')
+	return
+  end
+  
+  gImages:send_image(msg, input)
 end
 
 return gImages

otouto/plugins/games.lua

@@ -51,8 +51,7 @@ function games:send_game_photo(result, self, msg)
   local i = 0
   for k, v in pairs(images) do
     i = i+1
-    local file = download_to_file(v, 'game'..i..'.jpg')
+	utilities.send_photo(msg.chat.id, v, nil, msg.message_id)
-	utilities.send_photo(msg.chat.id, file, nil, msg.message_id)
   end
 end
 

otouto/plugins/myanimelist.lua

@@ -197,8 +197,7 @@ function mal:action(msg, config, matches)
       local text, image_url = mal:send_anime_data(anime_info)
 	  if image_url then
 	    utilities.send_typing(msg.chat.id, 'upload_photo')
-	    local file = download_to_file(image_url)
+		utilities.send_photo(msg.chat.id, image_url, nil, msg.message_id)
-		utilities.send_photo(msg.chat.id, file, nil, msg.message_id)
 	  end
 	  utilities.send_reply(msg, text, true)  
 	  return
@@ -212,8 +211,7 @@ function mal:action(msg, config, matches)
       local text, image_url = mal:send_manga_data(manga_info)
 	  if image_url then
 	    utilities.send_typing(msg.chat.id, 'upload_photo')
-	    local file = download_to_file(image_url)
+		utilities.send_photo(msg.chat.id, image_url, nil, msg.message_id)
-		utilities.send_photo(msg.chat.id, file, nil, msg.message_id)
 	  end
 	  utilities.send_reply(msg, text, true)
 	  return

otouto/plugins/tagesschau.lua

@@ -64,8 +64,7 @@ function tagesschau:action(msg, config, matches)
   local text, image_url = tagesschau:get_tagesschau_article(article)
   if image_url then
     utilities.send_typing(msg.chat.id, 'upload_photo')
-    local file = download_to_file(image_url)
+    utilities.send_photo(msg.chat.id, image_url, nil, msg.message_id)
-    utilities.send_photo(msg.chat.id, file, nil, msg.message_id)
   end
   utilities.send_reply(msg, text, 'HTML')
 end