Skip to content

Commit

Permalink
Tidy Code
Browse files Browse the repository at this point in the history
  • Loading branch information
@bladerail
bladerail committed Mar 30, 2022
1 parent 12161a8 commit 8ebaaa1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 25 deletions.
4 changes: 0 additions & 4 deletions server/meme/template.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ type Template struct {
}

func (t *Template) Render(text []string) (image.Image, error) {
// b := t.Image.Bounds()
// img := image.NewRGBA(image.Rect(0, 0, b.Dx(), b.Dy()))
dc := gg.NewContextForImage(t.Image)

// draw.Draw(img, img.Bounds(), t.Image, b.Min, draw.Src)

for i, slot := range t.TextSlots {
if i >= len(text) {
break
Expand Down
2 changes: 0 additions & 2 deletions server/meme/text_slot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ func (s *TextSlot) Render(dc *gg.Context, text string, debug bool) {
break
}

// Some black magic to draw outline
if s.OutlineColor != nil {
offset := face.Metrics().Height / 256 * fixed.Int26_6(outlineWidth)
for _, delta := range []fixed.Point26_6{
Expand All @@ -105,7 +104,6 @@ func (s *TextSlot) Render(dc *gg.Context, text string, debug bool) {
}

dc.SetColor(textColor)
// dc.SetRGB(0.5, 0.5, 0.2)
dc.DrawStringWrapped(text,
xStart,
yStart,
Expand Down
36 changes: 18 additions & 18 deletions server/memelibrary/assets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ func metadataAncientAliensYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/ancient-aliens.yaml", size: 20, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/ancient-aliens.yaml", size: 20, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1457,7 +1457,7 @@ func metadataBadLuckBrianYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/bad-luck-brian.yaml", size: 32, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/bad-luck-brian.yaml", size: 32, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1477,7 +1477,7 @@ func metadataBatmanSlappingRobinYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/batman-slapping-robin.yaml", size: 227, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/batman-slapping-robin.yaml", size: 227, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1497,7 +1497,7 @@ func metadataBoardroomSuggestionYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/boardroom-suggestion.yaml", size: 457, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/boardroom-suggestion.yaml", size: 457, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1517,7 +1517,7 @@ func metadataBraceYourselvesYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/brace-yourselves.yaml", size: 212, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/brace-yourselves.yaml", size: 212, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1542,7 +1542,7 @@ func metadataButThatsNoneOfMyBusinessYaml() (*asset, error) {
return a, nil
}

var _metadataChangeMyMindYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8d\x31\x8e\xc2\x30\x10\x45\xfb\x9c\xe2\x17\x5b\xec\x6a\x15\x94\x84\x02\x34\xc7\x88\x44\x43\x37\x22\x83\x6d\xe1\xd8\x91\x3d\x81\xe4\xf6\x08\x27\x15\xdd\x7b\xa3\xd1\xfb\x13\xab\x4a\x0a\x99\x2a\xa0\xc6\x6e\x84\xdf\xc3\xff\x1f\x6e\x96\x83\x11\x8c\x2b\x46\x17\x86\x0a\x00\x54\x16\xa5\x42\x9f\xf7\x9f\xb6\xa0\x2c\x3c\x4e\x5e\x08\xfd\x9c\xb3\x63\x64\x1b\x67\x3f\xc0\x0b\x3f\x05\x97\x47\x62\x17\xe4\x3b\x96\x7d\xd4\x7d\x74\x21\x74\x6d\x53\x4a\x2b\xa1\x3b\x6e\xf8\x72\x83\x5a\x42\xd7\x6c\x6a\xc5\x19\xab\x84\xf3\xa6\x29\x2a\xab\x8b\x81\x50\x9f\xca\xe1\x1e\x83\x12\xae\x6c\xea\x5e\xcc\xec\x39\x55\xef\x00\x00\x00\xff\xff\xab\x92\x80\xa6\xda\x00\x00\x00")
var _metadataChangeMyMindYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8d\x31\xce\xc2\x30\x0c\x46\xf7\x9e\xe2\x1b\xfe\xe1\x47\xa8\xa8\x2d\x03\xc8\x77\x60\x61\x64\x33\xd4\x24\x91\x9a\xa4\x4a\x8c\x68\x6f\x8f\x48\x3a\xb1\xbd\x67\xd9\xcf\x33\xab\x4a\x0a\x99\x1a\xa0\xc5\x66\x84\xff\xc3\x7e\x87\x87\xe5\x60\x04\x7e\x85\x77\x61\x6c\x00\x40\x65\x51\x2a\xf4\x5d\xff\xeb\x0b\xca\xc2\x7e\x9e\x84\x70\x29\xe7\x3e\x66\x85\x17\x2f\x19\x9c\x04\x6a\x05\x77\xc9\xfa\x9b\xcb\x53\xd4\xed\xed\x42\x18\xfa\xae\xb4\x56\xc2\x70\xac\xf8\x76\xa3\x5a\xc2\xd0\x55\xb5\xe2\x8c\x55\xc2\xb9\x6a\x8a\xca\xea\x62\x20\xb4\xa7\x32\x78\xc6\xa0\x84\x1b\x9b\xf6\x2a\xe6\x35\x71\x6a\x3e\x01\x00\x00\xff\xff\x1c\xe1\x3b\x58\xdc\x00\x00\x00")

func metadataChangeMyMindYamlBytes() ([]byte, error) {
return bindataRead(
Expand All @@ -1557,7 +1557,7 @@ func metadataChangeMyMindYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/change-my-mind.yaml", size: 218, mode: os.FileMode(420), modTime: time.Unix(1648662436, 0)}
info := bindataFileInfo{name: "metadata/change-my-mind.yaml", size: 220, mode: os.FileMode(420), modTime: time.Unix(1648663846, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -1737,7 +1737,7 @@ func metadataGirlRunningYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/girl-running.yaml", size: 17, mode: os.FileMode(420), modTime: time.Unix(1648662284, 0)}
info := bindataFileInfo{name: "metadata/girl-running.yaml", size: 17, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -1777,7 +1777,7 @@ func metadataGreatGatsbyYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/great-gatsby.yaml", size: 154, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/great-gatsby.yaml", size: 154, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1797,7 +1797,7 @@ func metadataGrumpyCatYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/grumpy-cat.yaml", size: 69, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/grumpy-cat.yaml", size: 69, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -1837,7 +1837,7 @@ func metadataHeresJohnnyYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/heres-johnny.yaml", size: 20, mode: os.FileMode(420), modTime: time.Unix(1648662284, 0)}
info := bindataFileInfo{name: "metadata/heres-johnny.yaml", size: 20, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -1917,7 +1917,7 @@ func metadataNotSureIfYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/not-sure-if.yaml", size: 168, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/not-sure-if.yaml", size: 168, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -1937,7 +1937,7 @@ func metadataOneDoesNotSimplyYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/one-does-not-simply.yaml", size: 172, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/one-does-not-simply.yaml", size: 172, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -2117,7 +2117,7 @@ func metadataScaredCatYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/scared-cat.yaml", size: 91, mode: os.FileMode(420), modTime: time.Unix(1648662284, 0)}
info := bindataFileInfo{name: "metadata/scared-cat.yaml", size: 91, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand All @@ -2137,7 +2137,7 @@ func metadataShutUpAndTakeMyMoneyYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/shut-up-and-take-my-money.yaml", size: 60, mode: os.FileMode(420), modTime: time.Unix(1648662284, 0)}
info := bindataFileInfo{name: "metadata/shut-up-and-take-my-money.yaml", size: 60, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -2197,7 +2197,7 @@ func metadataSuccessKidYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/success-kid.yaml", size: 80, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/success-kid.yaml", size: 80, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -2237,7 +2237,7 @@ func metadataTheMostInterestingManInTheWorldYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/the-most-interesting-man-in-the-world.yaml", size: 279, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/the-most-interesting-man-in-the-world.yaml", size: 279, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down Expand Up @@ -2377,7 +2377,7 @@ func metadataWeNeedToGoDeeperYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "metadata/we-need-to-go-deeper.yaml", size: 145, mode: os.FileMode(420), modTime: time.Unix(1648655266, 0)}
info := bindataFileInfo{name: "metadata/we-need-to-go-deeper.yaml", size: 145, mode: os.FileMode(420), modTime: time.Unix(1648663829, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down
2 changes: 1 addition & 1 deletion server/memelibrary/assets/metadata/change-my-mind.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ patterns:
- pattern: (.+) change my mind
text:
- $1
example: Russia should leave Ukraine change my mind
example: Mattermost memes are the best change my mind
slots:
- x: 210
y: 230
Expand Down

0 comments on commit 8ebaaa1

Please sign in to comment.