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

Merge branch 'bug/everyoneinweather' into 'master'

Browse source 
Fix weather being able to use @

See merge request jdejeu/ottobotv2!6
This commit is contained in:
Julius de Jeu 2019-06-11 15:25:00 +00:00
parent 0005646a5b 4033c88862
commit b78a331592
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/nl/voidcorp/discord/commands/fun/WeatherCommand.kt
View file

@ -19,7 +19,7 @@ class WeatherCommand : Command("weather", aliases = listOf("rain"), group = Comm
} }
val url = URI("http://wttr.in/${URLEncoder.encode(location, "utf-8")}_Fpm.png").toURL().openStream() val url = URI("http://wttr.in/${URLEncoder.encode(location, "utf-8")}_Fpm.png").toURL().openStream()
event.message.channel.sendFile(url, "$location.png").content("Weather in ${location.replace("+", " ")}").queue() event.message.channel.sendFile(url, "$location.png").content("Weather in ${location.replace("+", " ").replace("@here", "@hеre").replace("@everyone", "@еveryone") }").queue()
return CommandResult.SUCCESS return CommandResult.SUCCESS
} }

15
src/main/kotlin/nl/voidcorp/discord/commands/general/ReportCommand.kt
View file

@ -5,14 +5,22 @@ import nl.voidcorp.discord.command.CommandMessage
import nl.voidcorp.discord.command.CommandResult import nl.voidcorp.discord.command.CommandResult
import org.gitlab.api.GitlabAPI import org.gitlab.api.GitlabAPI
import org.gitlab.api.TokenType import org.gitlab.api.TokenType
import org.springframework.context.annotation.Condition
import org.springframework.context.annotation.ConditionContext
import org.springframework.context.annotation.Conditional
import org.springframework.core.type.AnnotatedTypeMetadata
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
@Conditional(ReportCommand.ReportAvailable::class)
@Service
class ReportCommand : Command( class ReportCommand : Command(
"report", "report",
helpMesage = "Report a bug or request a feature for the bot!", helpMesage = "Report a bug or request a feature for the bot!",
usage = "report bug/feature \"name\" \"description\"" usage = "report bug/feature \"name\" \"description\""
) { ) {
val api = GitlabAPI.connect("https://gitlab.voidcorp.nl/", "KUqA3G9DnPVtCgitmfgU", TokenType.PRIVATE_TOKEN) val api =
GitlabAPI.connect("https://gitlab.voidcorp.nl/", System.getenv("GITLAB_API_TOKEN"), TokenType.PRIVATE_TOKEN)
override fun handle(event: CommandMessage): CommandResult { override fun handle(event: CommandMessage): CommandResult {
if (event.params.size != 4) return CommandResult.PARAMETERS if (event.params.size != 4) return CommandResult.PARAMETERS
val theProject = api.projects.first { it.name.contains("ottobotv2") } val theProject = api.projects.first { it.name.contains("ottobotv2") }
@ -24,4 +32,9 @@ class ReportCommand : Command(
event.reply("Thanks for reporting, a new issue was created: ${theProject.webUrl}/issues/${issue.iid}") event.reply("Thanks for reporting, a new issue was created: ${theProject.webUrl}/issues/${issue.iid}")
return CommandResult.SUCCESS return CommandResult.SUCCESS
} }
class ReportAvailable : Condition {
override fun matches(context: ConditionContext, metadata: AnnotatedTypeMetadata) =
System.getenv("GITLAB_API_TOKEN") != null
}
} }