tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Stop using ioutil

Browse source
This commit is contained in:
Tulir Asokan 2021-10-31 13:30:19 +02:00
parent 47105b411f
commit dc9e08d39f
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bridgestate.go
View file

@ -21,7 +21,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"time" "time"
@ -128,7 +128,7 @@ func sendPreparedBridgeStateRequest(logger log.Logger, req *http.Request) bool {
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode < 200 || resp.StatusCode > 299 { if resp.StatusCode < 200 || resp.StatusCode > 299 {
respBody, _ := ioutil.ReadAll(resp.Body) respBody, _ := io.ReadAll(resp.Body)
if respBody != nil { if respBody != nil {
respBody = bytes.ReplaceAll(respBody, []byte("\n"), []byte("\\n")) respBody = bytes.ReplaceAll(respBody, []byte("\n"), []byte("\\n"))
} }

6
config/config.go
View file

@ -18,7 +18,7 @@ package config
import ( import (
"fmt" "fmt"
"io/ioutil" "os"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
@ -92,7 +92,7 @@ func (config *Config) CanDoublePuppet(userID id.UserID) bool {
} }
func Load(path string) (*Config, error) { func Load(path string) (*Config, error) {
data, err := ioutil.ReadFile(path) data, err := os.ReadFile(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -111,7 +111,7 @@ func (config *Config) Save(path string) error {
if err != nil { if err != nil {
return err return err
} }
return ioutil.WriteFile(path, data, 0600) return os.WriteFile(path, data, 0600)
} }
func (config *Config) MakeAppService() (*appservice.AppService, error) { func (config *Config) MakeAppService() (*appservice.AppService, error) {

2
go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/mattn/go-sqlite3 v1.14.9 github.com/mattn/go-sqlite3 v1.14.9
github.com/prometheus/client_golang v1.11.0 github.com/prometheus/client_golang v1.11.0
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
go.mau.fi/whatsmeow v0.0.0-20211029221633-b2fb3fda9a8c go.mau.fi/whatsmeow v0.0.0-20211031112955-d9ede8b4ef4b
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
google.golang.org/protobuf v1.27.1 google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0

4
go.sum
View file

@ -139,8 +139,8 @@ github.com/tidwall/sjson v1.2.3 h1:5+deguEhHSEjmuICXZ21uSSsXotWMA0orU783+Z7Cp8=
github.com/tidwall/sjson v1.2.3/go.mod h1:5WdjKx3AQMvCJ4RG6/2UYT7dLrGvJUV1x4jdTAyGvZs= github.com/tidwall/sjson v1.2.3/go.mod h1:5WdjKx3AQMvCJ4RG6/2UYT7dLrGvJUV1x4jdTAyGvZs=
go.mau.fi/libsignal v0.0.0-20211024113310-f9fc6a1855f2 h1:xpQTMgJGGaF+c8jV/LA/FVXAPJxZbSAGeflOc+Ly6uQ= go.mau.fi/libsignal v0.0.0-20211024113310-f9fc6a1855f2 h1:xpQTMgJGGaF+c8jV/LA/FVXAPJxZbSAGeflOc+Ly6uQ=
go.mau.fi/libsignal v0.0.0-20211024113310-f9fc6a1855f2/go.mod h1:3XlVlwOfp8f9Wri+C1D4ORqgUsN4ZvunJOoPjQMBhos= go.mau.fi/libsignal v0.0.0-20211024113310-f9fc6a1855f2/go.mod h1:3XlVlwOfp8f9Wri+C1D4ORqgUsN4ZvunJOoPjQMBhos=
go.mau.fi/whatsmeow v0.0.0-20211029221633-b2fb3fda9a8c h1:ZmmT3L8pMKLW3JhcP6Rt0dJg09N+20a8fROxr8MUKzg= go.mau.fi/whatsmeow v0.0.0-20211031112955-d9ede8b4ef4b h1:c9LwexDAVDsLNXcD4Vog5Y624sihnomf9XJl8ewtBl4=
go.mau.fi/whatsmeow v0.0.0-20211029221633-b2fb3fda9a8c/go.mod h1:ODEmmqeUn9eBDQHFc1S902YA3YFLtmaBujYRRFl53jI= go.mau.fi/whatsmeow v0.0.0-20211031112955-d9ede8b4ef4b/go.mod h1:ODEmmqeUn9eBDQHFc1S902YA3YFLtmaBujYRRFl53jI=
golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

6
portal.go
View file

@ -27,7 +27,7 @@ import (
"image/gif" "image/gif"
"image/jpeg" "image/jpeg"
"image/png" "image/png"
"io/ioutil" "io"
"math" "math"
"mime" "mime"
"net/http" "net/http"
@ -1997,7 +1997,7 @@ func (portal *Portal) convertWebPtoPNG(webpImage []byte) ([]byte, error) {
} }
func (portal *Portal) convertGifToVideo(gif []byte) ([]byte, error) { func (portal *Portal) convertGifToVideo(gif []byte) ([]byte, error) {
dir, err := ioutil.TempDir("", "gif-convert-*") dir, err := os.MkdirTemp("", "gif-convert-*")
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to make temp dir: %w", err) return nil, fmt.Errorf("failed to make temp dir: %w", err)
} }
@ -2036,7 +2036,7 @@ func (portal *Portal) convertGifToVideo(gif []byte) ([]byte, error) {
_ = outputFile.Close() _ = outputFile.Close()
_ = os.Remove(outputFile.Name()) _ = os.Remove(outputFile.Name())
}() }()
mp4, err := ioutil.ReadAll(outputFile) mp4, err := io.ReadAll(outputFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read mp4 from output file: %w", err) return nil, fmt.Errorf("failed to read mp4 from output file: %w", err)
} }