From bd27035629e54b12793d81cb843b2ec97d6b4af4 Mon Sep 17 00:00:00 2001 From: Mads Cordes Date: Wed, 11 Jan 2023 17:12:31 +0100 Subject: [PATCH] Avoid using "multiple" emojies in one emoji --- moths/emojies/bodyParts.go | 4 +-- moths/emojies/bugs.go | 4 +-- moths/emojies/cats.go | 10 ++++--- moths/emojies/countryFlags.go | 4 +-- moths/emojies/dogs.go | 12 ++++---- moths/emojies/faces.go | 4 +-- moths/emojies/geatures.go | 52 +++++++++++++++++------------------ 7 files changed, 47 insertions(+), 43 deletions(-) diff --git a/moths/emojies/bodyParts.go b/moths/emojies/bodyParts.go index e0575f3..d439eaa 100644 --- a/moths/emojies/bodyParts.go +++ b/moths/emojies/bodyParts.go @@ -2,7 +2,7 @@ package emojies import "github.com/enescakir/emoji" -var BODY_PARTS = Emojies{ +var BODY_PARTS = ToEmojies([]string{ emoji.FlexedBiceps.String(), emoji.MechanicalArm.String(), emoji.MechanicalLeg.String(), @@ -20,4 +20,4 @@ var BODY_PARTS = Emojies{ emoji.Eye.String(), emoji.Tongue.String(), emoji.Mouth.String(), -} +}) diff --git a/moths/emojies/bugs.go b/moths/emojies/bugs.go index 4e11aef..9c4e0f3 100644 --- a/moths/emojies/bugs.go +++ b/moths/emojies/bugs.go @@ -3,7 +3,7 @@ package emojies import "github.com/enescakir/emoji" // The fly (`moths` mascot) is in there -var BUGS = Emojies{ +var BUGS = ToEmojies([]string{ emoji.Snail.String(), emoji.Butterfly.String(), emoji.Bug.String(), @@ -20,4 +20,4 @@ var BUGS = Emojies{ emoji.Fly.String(), emoji.Worm.String(), emoji.Microbe.String(), -} +}) diff --git a/moths/emojies/cats.go b/moths/emojies/cats.go index 7dc6313..39c9f26 100644 --- a/moths/emojies/cats.go +++ b/moths/emojies/cats.go @@ -2,7 +2,7 @@ package emojies import "github.com/enescakir/emoji" -var CATS = Emojies{ +var cats = []string{ emoji.GrinningCat.String(), emoji.GrinningCatWithSmilingEyes.String(), emoji.CatWithTearsOfJoy.String(), @@ -14,7 +14,9 @@ var CATS = Emojies{ emoji.PoutingCat.String(), } -var CATS_DOG = append( - CATS, +var CATS = ToEmojies(cats) + +var CATS_DOG = ToEmojies(append( + cats, emoji.DogFace.String(), -) +)) diff --git a/moths/emojies/countryFlags.go b/moths/emojies/countryFlags.go index 0fb79cf..4d7e053 100644 --- a/moths/emojies/countryFlags.go +++ b/moths/emojies/countryFlags.go @@ -2,7 +2,7 @@ package emojies import "github.com/enescakir/emoji" -var COUNTRY_FLAGS = Emojies{ +var COUNTRY_FLAGS = ToEmojies([]string{ emoji.FlagForAscensionIsland.String(), emoji.FlagForAndorra.String(), emoji.FlagForUnitedArabEmirates.String(), @@ -261,4 +261,4 @@ var COUNTRY_FLAGS = Emojies{ emoji.FlagForSouthAfrica.String(), emoji.FlagForZambia.String(), emoji.FlagForZimbabwe.String(), -} +}) diff --git a/moths/emojies/dogs.go b/moths/emojies/dogs.go index c1e8e74..35f8449 100644 --- a/moths/emojies/dogs.go +++ b/moths/emojies/dogs.go @@ -2,17 +2,19 @@ package emojies import "github.com/enescakir/emoji" -var DOGS = Emojies{ +var dogs = []string{ emoji.DogFace.String(), emoji.Dog.String(), emoji.GuideDog.String(), - emoji.ServiceDog.String(), + // emoji.ServiceDog.String(), // Uses multiple "emojies" in one emoji.Poodle.String(), emoji.Wolf.String(), emoji.HotDog.String(), // Wait, what? } -var DOGS_CAT = append( - DOGS, +var DOGS = ToEmojies(dogs) + +var DOGS_CAT = ToEmojies(append( + dogs, emoji.KissingCat.String(), -) +)) diff --git a/moths/emojies/faces.go b/moths/emojies/faces.go index 777fb14..ed2128f 100644 --- a/moths/emojies/faces.go +++ b/moths/emojies/faces.go @@ -2,7 +2,7 @@ package emojies import "github.com/enescakir/emoji" -var FACES = Emojies{ +var FACES = ToEmojies([]string{ emoji.PileOfPoo.String(), emoji.ClownFace.String(), emoji.Ogre.String(), @@ -11,4 +11,4 @@ var FACES = Emojies{ emoji.Alien.String(), emoji.AlienMonster.String(), emoji.Robot.String(), -} +}) diff --git a/moths/emojies/geatures.go b/moths/emojies/geatures.go index 0f3f2f3..d0cad78 100644 --- a/moths/emojies/geatures.go +++ b/moths/emojies/geatures.go @@ -2,7 +2,7 @@ package emojies import "github.com/enescakir/emoji" -var GESTURES = Emojies{ +var GESTURES = ToEmojies([]string{ emoji.PersonFrowning.String(), emoji.PersonPouting.String(), emoji.PersonGesturingNo.String(), @@ -13,30 +13,30 @@ var GESTURES = Emojies{ emoji.PersonBowing.String(), emoji.PersonFacepalming.String(), emoji.PersonShrugging.String(), -} +}) -var GESTURES_MAN = Emojies{ - emoji.ManFrowning.String(), - emoji.ManPouting.String(), - emoji.ManGesturingNo.String(), - emoji.ManGesturingOk.String(), - emoji.ManTippingHand.String(), - emoji.ManRaisingHand.String(), - emoji.DeafMan.String(), - emoji.ManBowing.String(), - emoji.ManFacepalming.String(), - emoji.ManShrugging.String(), -} +// var GESTURES_MAN = ToEmojies([]string{ +// emoji.ManFrowning.String(), +// emoji.ManPouting.String(), +// emoji.ManGesturingNo.String(), +// emoji.ManGesturingOk.String(), +// emoji.ManTippingHand.String(), +// emoji.ManRaisingHand.String(), +// emoji.DeafMan.String(), +// emoji.ManBowing.String(), +// emoji.ManFacepalming.String(), +// emoji.ManShrugging.String(), +// }) -var GESTURES_WOMAN = Emojies{ - emoji.WomanFrowning.String(), - emoji.WomanPouting.String(), - emoji.WomanGesturingNo.String(), - emoji.WomanGesturingOk.String(), - emoji.WomanTippingHand.String(), - emoji.WomanRaisingHand.String(), - emoji.DeafWoman.String(), - emoji.WomanBowing.String(), - emoji.WomanFacepalming.String(), - emoji.WomanShrugging.String(), -} +// var GESTURES_WOMAN = ToEmojies([]string{ +// emoji.WomanFrowning.String(), +// emoji.WomanPouting.String(), +// emoji.WomanGesturingNo.String(), +// emoji.WomanGesturingOk.String(), +// emoji.WomanTippingHand.String(), +// emoji.WomanRaisingHand.String(), +// emoji.DeafWoman.String(), +// emoji.WomanBowing.String(), +// emoji.WomanFacepalming.String(), +// emoji.WomanShrugging.String(), +// })