Merge branch 'master' of github.com:JonasFranzDEV/mensabot

remotes/1678337322733154087/tmp_refs/heads/master
Jonas Franz 5 years ago
commit 0a36aa3d6e
  1. 15
      bot.go

@ -15,6 +15,7 @@ import (
var (
canteen *openmensa.Canteen
<<<<<<< HEAD
emojis = map[string][]string{
":pizza:": {"pizza"},
":hotdog:": {"wurst"},
@ -25,6 +26,20 @@ var (
":poultry_leg:": {"hänchen"},
":meat_on_bone:": {"schnitzel"},
":spaghetti:": {"nudel", "spaghetti", "pasta"},
=======
emojis = map[string][]string {
":pizza:": {"pizza"},
":hotdog:": {"wurst", "würstchen", "hotdog"},
":fries:": {"pommes"},
":hamburger:": {"burger"},
":fish:": {"lachs", "filet", "fisch", "kabeljau", "hering", "makrele", "sardine", "schellfisch", "seezunge"},
":apple:": {"apfel", "äpfel"},
":poultry_leg:": {"hähnchen"},
":meat_on_bone:": {"schnitzel", "steak", "schwein", "huhn", "geflügel"},
":spaghetti:": {"nudel", "spaghetti", "pasta"},
":bread:": {"brot", "brötchen"},
":rice:": {"reis"}
>>>>>>> ccc765c03c0d2197ea832ae11f6f8795cdf7ac6b
}
)

Loading…
Cancel
Save