From 056e97d93033878ab8fb9369be20aa06b7d7bc8d Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 4 Feb 2023 15:36:42 +0200
Subject: [PATCH] Remove remaining uses of ioutil

---
 appservice/appservice.go   | 5 ++---
 appservice/http.go         | 4 ++--
 appservice/registration.go | 6 +++---
 util/ffmpeg/convert.go     | 5 ++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/appservice/appservice.go b/appservice/appservice.go
index c14ced23..5b369c5b 100644
--- a/appservice/appservice.go
+++ b/appservice/appservice.go
@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"html/template"
-	"io/ioutil"
 	"net/http"
 	"net/http/cookiejar"
 	"os"
@@ -55,7 +54,7 @@ func Create() *AppService {
 
 // Load an appservice config from a file.
 func Load(path string) (*AppService, error) {
-	data, readErr := ioutil.ReadFile(path)
+	data, readErr := os.ReadFile(path)
 	if readErr != nil {
 		return nil, readErr
 	}
@@ -172,7 +171,7 @@ func (as *AppService) Save(path string) error {
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(path, data, 0644)
+	return os.WriteFile(path, data, 0644)
 }
 
 // YAML returns the config in YAML format.
diff --git a/appservice/http.go b/appservice/http.go
index a6d6afbf..7e740710 100644
--- a/appservice/http.go
+++ b/appservice/http.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -107,7 +107,7 @@ func (as *AppService) PutTransaction(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	defer r.Body.Close()
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil || len(body) == 0 {
 		Error{
 			ErrorCode:  ErrNotJSON,
diff --git a/appservice/registration.go b/appservice/registration.go
index 822ee880..f9c93fe4 100644
--- a/appservice/registration.go
+++ b/appservice/registration.go
@@ -7,7 +7,7 @@
 package appservice
 
 import (
-	"io/ioutil"
+	"os"
 	"regexp"
 
 	"gopkg.in/yaml.v3"
@@ -41,7 +41,7 @@ func CreateRegistration() *Registration {
 
 // LoadRegistration loads a YAML file and turns it into a Registration.
 func LoadRegistration(path string) (*Registration, error) {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
@@ -60,7 +60,7 @@ func (reg *Registration) Save(path string) error {
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(path, data, 0600)
+	return os.WriteFile(path, data, 0600)
 }
 
 // YAML returns the registration in YAML format.
diff --git a/util/ffmpeg/convert.go b/util/ffmpeg/convert.go
index 2d3a6439..1899eecb 100644
--- a/util/ffmpeg/convert.go
+++ b/util/ffmpeg/convert.go
@@ -9,7 +9,6 @@ package ffmpeg
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -69,7 +68,7 @@ func ConvertPath(ctx context.Context, inputFile string, outputExtension string,
 //
 // Returns: the converted data
 func ConvertBytes(ctx context.Context, data []byte, outputExtension string, inputArgs []string, outputArgs []string, inputMime string) ([]byte, error) {
-	tempdir, err := ioutil.TempDir("", "mautrix_ffmpeg_*")
+	tempdir, err := os.MkdirTemp("", "mautrix_ffmpeg_*")
 	if err != nil {
 		return nil, err
 	}
@@ -91,5 +90,5 @@ func ConvertBytes(ctx context.Context, data []byte, outputExtension string, inpu
 	if err != nil {
 		return nil, err
 	}
-	return ioutil.ReadFile(outputPath)
+	return os.ReadFile(outputPath)
 }