diff --git a/README.md b/README.md index e022ccf..b9b4b19 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,14 @@ You can invite the bot on your server with [this link](https://discordapp.com/ap ## History +* 1.3 + * **Complex memes syntax** + * Examples in docs + * "Reaction" templates + * Reworked CLI arguments + * More unit testing + * More docs + * Bug fix * 1.2 * Reworked text fitting * Unit testing diff --git a/docs/README.md b/docs/README.md index 1283b23..fde809e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -121,7 +121,48 @@ Click on an image to enlarge it. [↑ back to top](#meme-otron-guide) - +|||| +|:---:|:---:|:---:| +|**aliens**
more info|**alive**
alt: no_brain
more info|**argument**
alt: wrestlers
more info| +|enlarge|enlarge|enlarge| +|**bender**
alt: hookers, blackjack
more info|**born_cool**
more info|**brain3**| +|enlarge|enlarge|enlarge| +|**brain4**
alt: brains
more info|**brain5**|**buff**
alt: tom, jerry
more info| +|enlarge|enlarge|enlarge| +|**burn**
alt: paper
more info|**button**
alt: nut
more info|**bye_mom**
alt: google
more info| +|enlarge|enlarge|enlarge| +|**clock**
more info|**culture**
alt: anime
more info|**disappointed**
more info| +|enlarge|enlarge|enlarge| +|**distracted**
alt: boyfried, cheating, girlfriend
more info|**dont_look**
alt: ricky, mom, influenced
more info|**drake**
more info| +|enlarge|enlarge|enlarge| +|**drift**
alt: exit
more info|**everywhere**
alt: buzz, woody
more info|**everywhere2**
alt: angry, diapers
more info| +|enlarge|enlarge|enlarge| +|**fight**
alt: vaping
more info|**fine**
alt: fire, dog
more info|**flex_tape**
alt: flex, tape
more info| +|enlarge|enlarge|enlarge| +|**gate**
more info|**girl_cat**
more info|**grandma**
more info| +|enlarge|enlarge|enlarge| +|**gru**
alt: plan
more info|**guys**
alt: explain, paid
more info|**handshake**
more info| +|enlarge|enlarge|enlarge| +|**handshake2**
alt: scott
more info|**idea**
alt: gentlemen
more info|**lion**
alt: shadowy, king, light
more info| +|enlarge|enlarge|enlarge| +|**meeting**
alt: boardroom, suggestion
more info|**mini**
alt: joker
more info|**nobody_cares**
alt: nobody, jurassic, park, jurassic_park
more info| +|enlarge|enlarge|enlarge| +|**nope**
more info|**overconfident**
alt: alcohol, depressed
more info|**patrick**
alt: wallet, id
more info| +|enlarge|enlarge|enlarge| +|**pigeon**
alt: butterfly
more info|**pills**
alt: swallow
more info|**pleasure3**
alt: satisfied3| +|enlarge|enlarge|enlarge| +|**pleasure4**
alt: pleasure, satisfied, satisfied4
more info|**salt_bae**
alt: salt
more info|**scary**
alt: spongebob, fearless
more info| +|enlarge|enlarge|enlarge| +|**seagull2**
alt: seagull, screaming
more info|**seagull4**|**see_that_guy**
more info| +|enlarge|enlarge|enlarge| +|**sleeping**
alt: brain
more info|**spiderman**
alt: same
more info|**struggle**
alt: choice, hero
more info| +|enlarge|enlarge|enlarge| +|**t_pose**
alt: dominance, monika
more info|**tom_cousins**
alt: cousins, backup, goons
more info|**tough2**
alt: tough, fight
more info| +|enlarge|enlarge|enlarge| +|**tough2bis**
alt: soft|**tough3**|**trump**
alt: law
more info| +|enlarge|enlarge|enlarge| +|**trust_nobody**
alt: yourself, gun
more info|**truth**
alt: scroll
more info|**winnie2**
alt: winnie
more info| +|enlarge|enlarge|enlarge||| ### Reactions (no text) @@ -138,21 +179,53 @@ Click on an image to enlarge it. [↑ back to top](#meme-otron-guide) +> +``` +brain3 +"Making memes using an image editor" +"Making memes using a Python script" +"Making memes using a Discord bot" +``` + +![](example1.jpg) ### Example 2: Use of empty texts [↑ back to top](#meme-otron-guide) +> The 5th text is not set and the 3rd is explicitly set to empty +``` +see_that_guy +"See that guy over there?" +"He uses an image editor to make memes" +"" +"meme-otron dev" +``` + +![](example2.jpg) ### Example 3: Text + template [↑ back to top](#meme-otron-guide) +> Note how texts make paragraphs +``` +text +"*Meme has a 'made with meme-otron' watermark*" +"reddit: ..." +"9gag: ..." +"meme-otron dev:" +- +culture +"meme otron" +``` + +![](example3.jpg) diff --git a/docs/preview/bender.jpg b/docs/preview/bender.jpg index 4e05aa4..5e12ff8 100644 Binary files a/docs/preview/bender.jpg and b/docs/preview/bender.jpg differ diff --git a/docs/preview/born_cool.jpg b/docs/preview/born_cool.jpg index 8db7263..d7d68fa 100644 Binary files a/docs/preview/born_cool.jpg and b/docs/preview/born_cool.jpg differ diff --git a/docs/preview/buff.jpg b/docs/preview/buff.jpg index d5b9053..4f1851f 100644 Binary files a/docs/preview/buff.jpg and b/docs/preview/buff.jpg differ diff --git a/docs/preview/button.jpg b/docs/preview/button.jpg index 503b846..82ff049 100644 Binary files a/docs/preview/button.jpg and b/docs/preview/button.jpg differ diff --git a/docs/preview/bye_mom.jpg b/docs/preview/bye_mom.jpg index f7ad0bc..51b587a 100644 Binary files a/docs/preview/bye_mom.jpg and b/docs/preview/bye_mom.jpg differ diff --git a/docs/preview/culture.jpg b/docs/preview/culture.jpg index 2834bb6..af5e546 100644 Binary files a/docs/preview/culture.jpg and b/docs/preview/culture.jpg differ diff --git a/docs/preview/disappointed.jpg b/docs/preview/disappointed.jpg index 4c8d2d5..60b2d33 100644 Binary files a/docs/preview/disappointed.jpg and b/docs/preview/disappointed.jpg differ diff --git a/docs/preview/drift.jpg b/docs/preview/drift.jpg index f8c07e0..7a1ee8b 100644 Binary files a/docs/preview/drift.jpg and b/docs/preview/drift.jpg differ diff --git a/docs/preview/everywhere.jpg b/docs/preview/everywhere.jpg index ce2da02..3c38217 100644 Binary files a/docs/preview/everywhere.jpg and b/docs/preview/everywhere.jpg differ diff --git a/docs/preview/fight.jpg b/docs/preview/fight.jpg index 08e7bf7..afb0808 100644 Binary files a/docs/preview/fight.jpg and b/docs/preview/fight.jpg differ diff --git a/docs/preview/fine.jpg b/docs/preview/fine.jpg index a2dd592..b1e6e81 100644 Binary files a/docs/preview/fine.jpg and b/docs/preview/fine.jpg differ diff --git a/docs/preview/gate.jpg b/docs/preview/gate.jpg index a1bf287..a62eeec 100644 Binary files a/docs/preview/gate.jpg and b/docs/preview/gate.jpg differ diff --git a/docs/preview/girl_cat.jpg b/docs/preview/girl_cat.jpg index af17341..17e8c07 100644 Binary files a/docs/preview/girl_cat.jpg and b/docs/preview/girl_cat.jpg differ diff --git a/docs/preview/grandma.jpg b/docs/preview/grandma.jpg index afc38a6..89794d1 100644 Binary files a/docs/preview/grandma.jpg and b/docs/preview/grandma.jpg differ diff --git a/docs/preview/gru.jpg b/docs/preview/gru.jpg index 587a50e..da92ced 100644 Binary files a/docs/preview/gru.jpg and b/docs/preview/gru.jpg differ diff --git a/docs/preview/handshake.jpg b/docs/preview/handshake.jpg index 0089303..6fca066 100644 Binary files a/docs/preview/handshake.jpg and b/docs/preview/handshake.jpg differ diff --git a/docs/preview/handshake2.jpg b/docs/preview/handshake2.jpg index ae110eb..22cf0e9 100644 Binary files a/docs/preview/handshake2.jpg and b/docs/preview/handshake2.jpg differ diff --git a/docs/preview/mini.jpg b/docs/preview/mini.jpg index 93d4603..14f1906 100644 Binary files a/docs/preview/mini.jpg and b/docs/preview/mini.jpg differ diff --git a/docs/preview/overconfident.jpg b/docs/preview/overconfident.jpg index 5af506e..888489d 100644 Binary files a/docs/preview/overconfident.jpg and b/docs/preview/overconfident.jpg differ diff --git a/docs/preview/pigeon.jpg b/docs/preview/pigeon.jpg index 7683cd7..63d57d2 100644 Binary files a/docs/preview/pigeon.jpg and b/docs/preview/pigeon.jpg differ diff --git a/docs/preview/seagull4.jpg b/docs/preview/seagull4.jpg index 9503542..e431d58 100644 Binary files a/docs/preview/seagull4.jpg and b/docs/preview/seagull4.jpg differ diff --git a/docs/preview/spiderman.jpg b/docs/preview/spiderman.jpg index 496f23d..4b4e4f3 100644 Binary files a/docs/preview/spiderman.jpg and b/docs/preview/spiderman.jpg differ diff --git a/docs/preview/tom_cousins.jpg b/docs/preview/tom_cousins.jpg index ad81c87..89f2675 100644 Binary files a/docs/preview/tom_cousins.jpg and b/docs/preview/tom_cousins.jpg differ diff --git a/docs/preview/tough2.jpg b/docs/preview/tough2.jpg index 0df3511..b4a75f0 100644 Binary files a/docs/preview/tough2.jpg and b/docs/preview/tough2.jpg differ diff --git a/docs/preview/tough2bis.jpg b/docs/preview/tough2bis.jpg index b46875e..b34b1ee 100644 Binary files a/docs/preview/tough2bis.jpg and b/docs/preview/tough2bis.jpg differ diff --git a/docs/preview/trump.jpg b/docs/preview/trump.jpg index 1ede05e..7cff7aa 100644 Binary files a/docs/preview/trump.jpg and b/docs/preview/trump.jpg differ diff --git a/docs/preview/trust_nobody.jpg b/docs/preview/trust_nobody.jpg index 6b3f83e..e0fbf69 100644 Binary files a/docs/preview/trust_nobody.jpg and b/docs/preview/trust_nobody.jpg differ diff --git a/docs/preview/truth.jpg b/docs/preview/truth.jpg index a086343..4b1452c 100644 Binary files a/docs/preview/truth.jpg and b/docs/preview/truth.jpg differ diff --git a/docs/preview/winnie2.jpg b/docs/preview/winnie2.jpg index fbb3a85..b626cbb 100644 Binary files a/docs/preview/winnie2.jpg and b/docs/preview/winnie2.jpg differ diff --git a/docs/templates/bender.jpg b/docs/templates/bender.jpg index 6a54832..f3f72f7 100644 Binary files a/docs/templates/bender.jpg and b/docs/templates/bender.jpg differ diff --git a/docs/templates/born_cool.jpg b/docs/templates/born_cool.jpg index 1827dd2..deb4698 100644 Binary files a/docs/templates/born_cool.jpg and b/docs/templates/born_cool.jpg differ diff --git a/docs/templates/buff.jpg b/docs/templates/buff.jpg index 3a98cfc..875b9fc 100644 Binary files a/docs/templates/buff.jpg and b/docs/templates/buff.jpg differ diff --git a/docs/templates/button.jpg b/docs/templates/button.jpg index 3731601..a64fa26 100644 Binary files a/docs/templates/button.jpg and b/docs/templates/button.jpg differ diff --git a/docs/templates/bye_mom.jpg b/docs/templates/bye_mom.jpg index cfec0d4..91533a5 100644 Binary files a/docs/templates/bye_mom.jpg and b/docs/templates/bye_mom.jpg differ diff --git a/docs/templates/culture.jpg b/docs/templates/culture.jpg index 4f872c6..1bd99d8 100644 Binary files a/docs/templates/culture.jpg and b/docs/templates/culture.jpg differ diff --git a/docs/templates/disappointed.jpg b/docs/templates/disappointed.jpg index d51959a..b4c1df4 100644 Binary files a/docs/templates/disappointed.jpg and b/docs/templates/disappointed.jpg differ diff --git a/docs/templates/drift.jpg b/docs/templates/drift.jpg index 5ff4a6b..bbcf064 100644 Binary files a/docs/templates/drift.jpg and b/docs/templates/drift.jpg differ diff --git a/docs/templates/everywhere.jpg b/docs/templates/everywhere.jpg index 3509903..eb72d9f 100644 Binary files a/docs/templates/everywhere.jpg and b/docs/templates/everywhere.jpg differ diff --git a/docs/templates/fight.jpg b/docs/templates/fight.jpg index 622187b..70de25d 100644 Binary files a/docs/templates/fight.jpg and b/docs/templates/fight.jpg differ diff --git a/docs/templates/fine.jpg b/docs/templates/fine.jpg index 5de37fe..db1c11e 100644 Binary files a/docs/templates/fine.jpg and b/docs/templates/fine.jpg differ diff --git a/docs/templates/gate.jpg b/docs/templates/gate.jpg index 4563c3d..57068b0 100644 Binary files a/docs/templates/gate.jpg and b/docs/templates/gate.jpg differ diff --git a/docs/templates/girl_cat.jpg b/docs/templates/girl_cat.jpg index ab23119..6d6bc8d 100644 Binary files a/docs/templates/girl_cat.jpg and b/docs/templates/girl_cat.jpg differ diff --git a/docs/templates/grandma.jpg b/docs/templates/grandma.jpg index b68ecd6..f623030 100644 Binary files a/docs/templates/grandma.jpg and b/docs/templates/grandma.jpg differ diff --git a/docs/templates/gru.jpg b/docs/templates/gru.jpg index 1ebe33b..37cc74d 100644 Binary files a/docs/templates/gru.jpg and b/docs/templates/gru.jpg differ diff --git a/docs/templates/handshake.jpg b/docs/templates/handshake.jpg index 774483a..a84ec69 100644 Binary files a/docs/templates/handshake.jpg and b/docs/templates/handshake.jpg differ diff --git a/docs/templates/handshake2.jpg b/docs/templates/handshake2.jpg index 4038a6a..210779d 100644 Binary files a/docs/templates/handshake2.jpg and b/docs/templates/handshake2.jpg differ diff --git a/docs/templates/mini.jpg b/docs/templates/mini.jpg index 3cfb638..47c0d04 100644 Binary files a/docs/templates/mini.jpg and b/docs/templates/mini.jpg differ diff --git a/docs/templates/overconfident.jpg b/docs/templates/overconfident.jpg index f00172e..6b9afef 100644 Binary files a/docs/templates/overconfident.jpg and b/docs/templates/overconfident.jpg differ diff --git a/docs/templates/pigeon.jpg b/docs/templates/pigeon.jpg index bb8181e..328e601 100644 Binary files a/docs/templates/pigeon.jpg and b/docs/templates/pigeon.jpg differ diff --git a/docs/templates/seagull4.jpg b/docs/templates/seagull4.jpg index 9a9c674..f4c28d9 100644 Binary files a/docs/templates/seagull4.jpg and b/docs/templates/seagull4.jpg differ diff --git a/docs/templates/spiderman.jpg b/docs/templates/spiderman.jpg index 7c319c8..c71a051 100644 Binary files a/docs/templates/spiderman.jpg and b/docs/templates/spiderman.jpg differ diff --git a/docs/templates/tom_cousins.jpg b/docs/templates/tom_cousins.jpg index eb3ceee..6931166 100644 Binary files a/docs/templates/tom_cousins.jpg and b/docs/templates/tom_cousins.jpg differ diff --git a/docs/templates/tough2.jpg b/docs/templates/tough2.jpg index 87352c4..f75960b 100644 Binary files a/docs/templates/tough2.jpg and b/docs/templates/tough2.jpg differ diff --git a/docs/templates/tough2bis.jpg b/docs/templates/tough2bis.jpg index fe1193e..6a1c459 100644 Binary files a/docs/templates/tough2bis.jpg and b/docs/templates/tough2bis.jpg differ diff --git a/docs/templates/trump.jpg b/docs/templates/trump.jpg index 141c704..ab313e6 100644 Binary files a/docs/templates/trump.jpg and b/docs/templates/trump.jpg differ diff --git a/docs/templates/trust_nobody.jpg b/docs/templates/trust_nobody.jpg index bf43783..fd4269e 100644 Binary files a/docs/templates/trust_nobody.jpg and b/docs/templates/trust_nobody.jpg differ diff --git a/docs/templates/truth.jpg b/docs/templates/truth.jpg index 0fa1d3e..4994dd5 100644 Binary files a/docs/templates/truth.jpg and b/docs/templates/truth.jpg differ diff --git a/docs/templates/winnie2.jpg b/docs/templates/winnie2.jpg index 983f73c..3224c90 100644 Binary files a/docs/templates/winnie2.jpg and b/docs/templates/winnie2.jpg differ