jdejeu/ottobotv2
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bug/disalloweveryone' into 'master'

Browse source 
Make all output not have @everyone or @here in it

See merge request jdejeu/ottobotv2!5
This commit is contained in:
Julius de Jeu 2019-06-11 14:56:46 +00:00
parent 190106b46f 95829d4c80
commit 0005646a5b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/kotlin/nl/voidcorp/discord/command/CommandMessage.kt
View file

@ -17,7 +17,8 @@ data class CommandMessage(
fun reply(message: String) = fun reply(message: String) =
MessageBuilder(message).buildAll(MessageBuilder.SplitPolicy.SPACE).forEach { reply(it) } MessageBuilder(message).apply { this.replace("@here", "@hеre").replace("@everyone", "@еveryone") }
.buildAll(MessageBuilder.SplitPolicy.SPACE).forEach { reply(it) }
fun reply(messageEmbed: MessageEmbed) = event.channel.sendMessage(messageEmbed).queue() fun reply(messageEmbed: MessageEmbed) = event.channel.sendMessage(messageEmbed).queue()

2
src/main/kotlin/nl/voidcorp/discord/commands/management/SetVerifiedCommand.kt
View file

@ -5,7 +5,7 @@ import nl.voidcorp.discord.storage.GuildStore
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
@Service @Service
class SetVerifiedCommand : Command("verify", location = CommandSource.GUILD, commandLevel = CommandLevel.ADMIN) { class SetVerifiedCommand : Command("verify", location = CommandSource.GUILD, commandLevel = CommandLevel.ADMIN, group = CommandGroup.ADMIN) {
override fun handle(event: CommandMessage): CommandResult { override fun handle(event: CommandMessage): CommandResult {
val store = repo.findByGuildId(event.guild!!.idLong) ?: GuildStore(event.guild.idLong) val store = repo.findByGuildId(event.guild!!.idLong) ?: GuildStore(event.guild.idLong)
store.defaultVerified = !store.defaultVerified store.defaultVerified = !store.defaultVerified

2
src/main/resources/application.properties
View file

@ -8,4 +8,4 @@ spring.jpa.generate-ddl=true
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
ottobot.version=1.4 ottobot.version=1.5