Akamaru/Mikubot-2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge Upstream

Browse Source
This commit is contained in:
Akamaru 2016-10-28 23:15:08 +02:00
commit bbb00530fc
5 changed files with 387 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ merge.sh
miku/plugins/link_warning.lua miku/plugins/link_warning.lua
luarocks luarocks
miku/plugins/gTrendDoge.lua miku/plugins/gTrendDoge.lua
miku/plugins/xrel_search.lua

4
miku/plugins/github.lua
View File

@ -25,7 +25,7 @@ function github:send_github_data(data)
if not data.owner then return nil end if not data.owner then return nil end
local name = '<b>'..data.name..'</b>' local name = '<b>'..data.name..'</b>'
if data.description then if data.description then
description = '<i>'..data.description..'</i>' description = '\n<i>'..data.description..'</i>'
else else
description = '' description = ''
end end
@ -46,7 +46,7 @@ function github:send_github_data(data)
else else
homepage = '\n<a href="'..data.homepage..'">Homepage besuchen</a>' homepage = '\n<a href="'..data.homepage..'">Homepage besuchen</a>'
end end
local text = name..' von '..owner..'\n'..description..'\n<pre>git clone '..clone_url..'</pre>'..language..issues..homepage local text = name..' von '..owner..description..'\n<pre>git clone '..clone_url..'</pre>'..language..issues..homepage
return text return text
end end

4
miku/plugins/notify.lua
View File

@ -87,11 +87,11 @@ function notify:action(msg, config, matches)
redis:hset(hash, 'id', msg.from.id) redis:hset(hash, 'id', msg.from.id)
print('Adde '..username..' zu redis set notify:ls') print('Adde '..username..' zu redis set notify:ls')
redis:sadd('notify:ls', username) redis:sadd('notify:ls', username)
local res = utilities.send_message(msg.from.id, 'Du erhältst jetzt Benachrichtigungen, wenn du angesprochen wirst, nutze `/notify del` zum Deaktivieren.', true, nil, true) local res = utilities.send_message(msg.from.id, 'Du erhältst jetzt Benachrichtigungen, wenn du angesprochen wirst. Nutze `/notify del` zum Deaktivieren.', true, nil, true)
if not res then if not res then
utilities.send_reply(msg, 'Bitte schreibe mir [privat](http://telegram.me/' .. self.info.username .. '?start=notify), um den Vorgang abzuschließen.', true) utilities.send_reply(msg, 'Bitte schreibe mir [privat](http://telegram.me/' .. self.info.username .. '?start=notify), um den Vorgang abzuschließen.', true)
elseif msg.chat.type ~= 'private' then elseif msg.chat.type ~= 'private' then
utilities.send_reply(msg, 'Du erhältst jetzt Benachrichtigungen, wenn du angesprochen wirst, nutze `/notify del` zum Deaktivieren.', true) utilities.send_reply(msg, 'Du erhältst jetzt Benachrichtigungen, wenn du angesprochen wirst. Nutze `/notify del` zum Deaktivieren.', true)
end end
end end
end end

2
miku/plugins/shell.lua
View File

@ -80,7 +80,7 @@ function shell:action(msg, config, matches)
-- Requires fswebcam (sudo apt-get install fswebcam) -- Requires fswebcam (sudo apt-get install fswebcam)
if msg.text:match('^/[Ww][Ee][Bb][Cc][Aa][Mm]$') then if msg.text:match('^/[Ww][Ee][Bb][Cc][Aa][Mm]$') then
run_command("fswebcam -r 640x480 --png 9 -D 1 /tmp/webcam.png") run_command("fswebcam -r 1280x1024 --png 9 -D 1 /tmp/webcam.png")
utilities.send_photo(msg.chat.id, '/tmp/webcam.png', nil, msg.message_id) utilities.send_photo(msg.chat.id, '/tmp/webcam.png', nil, msg.message_id)
return return
end end