Fixes for setups without bridges

master
Lars Mueller 2019-11-23 18:17:10 +01:00
parent e12f5e1448
commit adaad74da9
5 changed files with 30 additions and 8 deletions

16
.github/workflows/gradle.yml vendored Normal file
View File

@ -0,0 +1,16 @@
name: CI
on: [push]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Build IRC chat bridge bot
run: |
echo "Building IRC chat bridge bot..."
echo test, and deploy your project.

View File

@ -1,10 +1,10 @@
local schemedef={
local schemedef={children={
message_prefix={type="string"},
mention_prefix={type="string"},
mention_delim={type="string"},
content_prefix={type="string"},
message_suffix={type="string"},
}
}}
local conf_spec={type="table", children={
schemes={type="table", required_children={
@ -118,4 +118,4 @@ if bridges.discord or bridges.irc then
end
end
end
end

View File

@ -1,6 +1,6 @@
{
"schemes" : {
"minetest" : {"message_prefix": "", "mention_prefix": "#FFFF00@", "mention_delim": "#FFFF00, ", "content_prefix": "#FFFF00: #FFFFFF"},
"minetest" : {"message_prefix": "", "message_suffix": "", "mention_prefix": "#FFFF00@", "mention_delim": "#FFFF00, ", "content_prefix": "#FFFF00: #FFFFFF"},
"other" : null
},
@ -8,4 +8,4 @@
"discord" : null,
"irc" : null
}
}
}

View File

@ -170,7 +170,9 @@ minetest.chat_send_all=function(msg)
adv_message.internal=true
send_to_all(adv_message)
end
--ENDIF
--IFNDEF bridge
minetest.original_chat_send_player=minetest.chat_send_player
minetest.chat_send_player=function(name, msg)
local chatter=chatters[name]
@ -183,6 +185,8 @@ minetest.chat_send_player=function(name, msg)
local adv_message=message.new(nil, nil, msg)
adv_message.internal=true
local to_be_sent=message.build(adv_message, chatter.service)
--ENDIF
--IFNDEF irc
if chatter.irc then
irc_bridge.write("[PMS]"..chatter.name.." "..to_be_sent)
@ -193,6 +197,8 @@ minetest.chat_send_player=function(name, msg)
discord_bridge.write("[PMS]#FFFFFF "..chatter.name.." "..to_be_sent)
end
--ENDIF
--IFNDEF bridge
end
--ENDIF
@ -498,4 +504,4 @@ minetest.register_chatcommand(prefix.."logout", {
chatters[sendername].login = nil
return true, 'Logged out from "'..login..'"'
end
})
})

View File

@ -492,7 +492,7 @@ function irc_to_minetest(irc)
return table.concat(rope)
end
local color_conv = bridges.irc.convert_minetest_colors
local color_conv = (bridges.irc and bridges.irc.convert_minetest_colors) or "hex"
if color_conv == "hex" then -- always use hex, no matter what
function convert_color_to_irc(color)
@ -565,4 +565,4 @@ function minetest_to_irc(message)
i=i+1
end
return table.concat(res)
end
end