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:
Andreas Bielawski 2016-08-16 21:01:56 +02:00
commit 421a54a49a
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
miku/plugins/notify.lua
View File

@ -25,9 +25,9 @@ end
function notify:pre_process(msg, self) function notify:pre_process(msg, self)
local notify_users = redis:smembers('notify:ls') local notify_users = redis:smembers('notify:ls')
-- I call this beautiful lady the "if soup" -- I call this beautiful lady the "if soup"
if msg.chat.type == 'chat' or msg.chat.type == 'supergroup' then if msg.chat.type == 'group' or msg.chat.type == 'supergroup' then
if msg.text then if msg.text then
for _,user in pairs(notify_users) do for _,user in pairs(notify_users) do
if isWordFoundInString('@'..user, string.lower(msg.text)) then if isWordFoundInString('@'..user, string.lower(msg.text)) then
@ -37,16 +37,15 @@ function notify:pre_process(msg, self)
-- so that we don't send the user some private text, when he/she is not -- so that we don't send the user some private text, when he/she is not
-- in the group. -- in the group.
if redis:sismember('chat:'..chat_id..':users', id) then if redis:sismember('chat:'..chat_id..':users', id) then
-- ignore message, if user is mentioning him/herself -- ignore message, if user is mentioning him/herself
if id == tostring(msg.from.id) then break; end if id ~= tostring(msg.from.id) then
local send_date = run_command('date -d @'..msg.date..' +"%d.%m.%Y um %H:%M:%S Uhr"')
local send_date = run_command('date -d @'..msg.date..' +"%d.%m.%Y um %H:%M:%S Uhr"') local send_date = string.gsub(send_date, "\n", "")
local send_date = string.gsub(send_date, "\n", "") local from = string.gsub(msg.from.name, "%_", " ")
local from = string.gsub(msg.from.name, "%_", " ") local chat_name = string.gsub(msg.chat.title, "%_", " ")
local chat_name = string.gsub(msg.chat.title, "%_", " ") local text = from..' am '..send_date..' in "'..chat_name..'":\n\n'..msg.text
local text = from..' am '..send_date..' in "'..chat_name..'":\n\n'..msg.text utilities.send_message(self, id, text, true)
utilities.send_message(self, id, text, true) end
end end
end end
end end