Compare commits

..

No commits in common. "112cd5874bee599814d371aa54bc61f72cadf861" and "04fd2ccbe4b2990f17dfe38a0c9bb9a2134c554b" have entirely different histories.

3 changed files with 10 additions and 72 deletions

View File

@ -23,21 +23,14 @@ func NewClient(options ...func(*Client)) *Client {
} }
// set defaults // set defaults
var ok bool
if c.BaseUrl == "" { if c.BaseUrl == "" {
c.BaseUrl, ok = os.LookupEnv("SN_BASE_URL") c.BaseUrl = "https://stacker.news"
if !ok {
c.BaseUrl = "https://stacker.news"
}
} }
if c.ApiKey == "" { if c.ApiKey == "" {
c.ApiKey = os.Getenv("SN_API_KEY") c.ApiKey = os.Getenv("SN_API_KEY")
} }
if c.MediaUrl == "" { if c.MediaUrl == "" {
c.MediaUrl, ok = os.LookupEnv("SN_MEDIA_URL") c.MediaUrl = "https://m.stacker.news"
if !ok {
c.MediaUrl = "https://m.stacker.news"
}
} }
c.ApiUrl = fmt.Sprintf("%s/api/graphql", c.BaseUrl) c.ApiUrl = fmt.Sprintf("%s/api/graphql", c.BaseUrl)

View File

@ -26,18 +26,12 @@ type GetSignedPOSTResponse struct {
func (c *Client) UploadImage(img *image.RGBA) (string, error) { func (c *Client) UploadImage(img *image.RGBA) (string, error) {
var ( var (
b = img.Bounds() b = img.Bounds()
width = b.Dx() width = b.Max.X
height = b.Dy() height = b.Max.Y
size = width * height
type_ = "image/png" type_ = "image/png"
size int
) )
var imgBuf bytes.Buffer
if err := png.Encode(&imgBuf, img); err != nil {
return "", err
}
size = imgBuf.Len()
// get signed URL for S3 upload // get signed URL for S3 upload
body := GqlBody{ body := GqlBody{
Query: ` Query: `
@ -105,7 +99,9 @@ func (c *Client) UploadImage(img *image.RGBA) (string, error) {
if fw, err = w.CreateFormFile("file", "image.png"); err != nil { if fw, err = w.CreateFormFile("file", "image.png"); err != nil {
return "", err return "", err
} }
fw.Write(imgBuf.Bytes()) if err = png.Encode(fw, img); err != nil {
return "", err
}
if err = w.Close(); err != nil { if err = w.Close(); err != nil {
return "", err return "", err

55
user.go
View File

@ -1,57 +1,6 @@
package sn package sn
import (
"encoding/json"
"fmt"
)
type User struct { type User struct {
Id int `json:"id,string"` Id int `json:"id,string"`
Name string `json:"name"` Name string `json:"name"`
Privates UserPrivates `json:"privates"`
}
type UserPrivates struct {
Sats int `json:"sats"`
}
type MeResponse struct {
Errors []GqlError `json:"errors"`
Data struct {
Me User `json:"me"`
} `json:"data"`
}
func (c *Client) Me() (*User, error) {
body := GqlBody{
Query: `
query me {
me {
id
name
privates {
sats
}
}
}`,
}
resp, err := c.callApi(body)
if err != nil {
return nil, err
}
defer resp.Body.Close()
var respBody MeResponse
err = json.NewDecoder(resp.Body).Decode(&respBody)
if err != nil {
err = fmt.Errorf("error decoding me: %w", err)
return nil, err
}
err = c.checkForErrors(respBody.Errors)
if err != nil {
return nil, err
}
return &respBody.Data.Me, nil
} }