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-08-28 18:38:01 +02:00
parent 4ecf0439b0 0804d44bb8
commit a305708f01
4 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
miku/plugins/channels.lua
View File

@@ -11,18 +11,6 @@ function channels:init(config)
]]..config.cmd_pat..[[channel* _<enable>_/_<disable>_: Aktiviert/deaktiviert den Bot im Chat]]
end
-- Checks if bot was disabled on specific chat
function channels:is_channel_disabled(msg)
local hash = 'chat:'..msg.chat.id..':disabled'
local disabled = redis:get(hash)
if not disabled or disabled == "false" then
return false
end
return disabled
end
function channels:enable_channel(msg)
local hash = 'chat:'..msg.chat.id..':disabled'
local disabled = redis:get(hash)
@@ -55,12 +43,7 @@ function channels:pre_process(msg, config)
end
end
if channels:is_channel_disabled(msg) then
print('Channel wurde deaktiviert')
return
end
return msg
return msg
end
function channels:action(msg, config, matches)

12
miku/plugins/reddit_post.lua
View File

@@ -15,9 +15,9 @@ function reddit_post:get_reddit_data(subreddit, reddit_code)
end
function reddit_post:send_reddit_data(data)
local title = utilities.md_escape(data[1].data.children[1].data.title)
local author = utilities.md_escape(data[1].data.children[1].data.author)
local subreddit = utilities.md_escape(data[1].data.children[1].data.subreddit)
local title = data[1].data.children[1].data.title
local author = data[1].data.children[1].data.author
local subreddit = data[1].data.children[1].data.subreddit
if string.len(data[1].data.children[1].data.selftext) > 300 then
selftext = string.sub(unescape(data[1].data.children[1].data.selftext:gsub("%b<>", "")), 1, 300) .. '...'
else
@@ -30,7 +30,7 @@ function reddit_post:send_reddit_data(data)
end
local score = comma_value(data[1].data.children[1].data.score)
local comments = comma_value(data[1].data.children[1].data.num_comments)
local text = '*'..author..'* in */r/'..subreddit..'* _('..score..' Upvotes - '..comments..' Kommentare)_:\n'..title..'\n'..selftext..url
local text = '<b>'..author..'</b> in <b>/r/'..subreddit..'</b> <i>('..score..' Upvotes - '..comments..' Kommentare)</i>:\n<b>'..title..'\n</b>'..selftext..url
return text
end
@@ -44,7 +44,7 @@ function reddit_post:action(msg, config, matches)
local text = reddit_post:send_reddit_data(data)
if not text then utilities.send_reply(msg, config.errors.connection) return end
utilities.send_reply(msg, text, true)
utilities.send_reply(msg, text, 'HTML')
end
return reddit_post
return reddit_post