me/offline-twitter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all references to deprecated 'ioutil' package

Browse Source
This commit is contained in:
Alessio 2022-03-13 16:33:17 -07:00
parent f08da27cc2
commit 223734d001
15 changed files with 83 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.golangci.yaml
View File

@ -13,6 +13,7 @@ linters:
disable-all: true disable-all: true
enable: enable:
- deadcode - deadcode
- depguard
- errcheck - errcheck
- gosimple - gosimple
- govet - govet
@ -342,14 +343,14 @@ linters-settings:
- shadow - shadow
# depguard: depguard:
# list-type: blacklist list-type: blacklist
# include-go-root: false include-go-root: true
# packages: packages:
# - github.com/sirupsen/logrus - io/ioutil
# packages-with-error-message: packages-with-error-message:
# # specify an error message to output when a blacklisted package is used # specify an error message to output when a blacklisted package is used
# - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log" - io/ioutil: "replace with the matching functions from `io` or `os` packages"
# ifshort: # ifshort:
# # Maximum length of variable declaration measured in number of lines, after which linter won't suggest using short syntax. # # Maximum length of variable declaration measured in number of lines, after which linter won't suggest using short syntax.

4
persistence/media_download.go
View File

@ -2,7 +2,7 @@ package persistence
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -34,7 +34,7 @@ func (d DefaultDownloader) Curl(url string, outpath string) error {
return fmt.Errorf("Error %s: %s", url, resp.Status) return fmt.Errorf("Error %s: %s", url, resp.Status)
} }
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return fmt.Errorf("Error downloading image %s:\n %w", url, err) return fmt.Errorf("Error downloading image %s:\n %w", url, err)
} }

18
scraper/api_request_utils.go
View File

@ -3,7 +3,7 @@ package scraper
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/url" "net/url"
"time" "time"
@ -41,7 +41,7 @@ func (api API) GetFeedFor(user_id UserID, cursor string) (TweetResponse, error)
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
content, err := ioutil.ReadAll(resp.Body) content, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -52,7 +52,7 @@ func (api API) GetFeedFor(user_id UserID, cursor string) (TweetResponse, error)
return TweetResponse{}, fmt.Errorf("HTTP %s\n%s\n%s", resp.Status, s, content) return TweetResponse{}, fmt.Errorf("HTTP %s\n%s\n%s", resp.Status, s, content)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return TweetResponse{}, fmt.Errorf("Error reading response body for GetUserFeedFor(%d):\n %w", user_id, err) return TweetResponse{}, fmt.Errorf("Error reading response body for GetUserFeedFor(%d):\n %w", user_id, err)
} }
@ -131,14 +131,14 @@ func (api API) GetTweet(id TweetID, cursor string) (TweetResponse, error) {
defer resp.Body.Close() defer resp.Body.Close()
if !(resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusForbidden) { if !(resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusForbidden) {
content, err := ioutil.ReadAll(resp.Body) content, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
panic(err) panic(err)
} }
return TweetResponse{}, fmt.Errorf("Error getting %q. HTTP %s: %s", req.URL, resp.Status, content) return TweetResponse{}, fmt.Errorf("Error getting %q. HTTP %s: %s", req.URL, resp.Status, content)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return TweetResponse{}, fmt.Errorf("Error reading HTTP request:\n %w", err) return TweetResponse{}, fmt.Errorf("Error reading HTTP request:\n %w", err)
} }
@ -209,14 +209,14 @@ func (api API) GetUser(handle UserHandle) (APIUser, error) {
// Sometimes it randomly gives 403 Forbidden. API's fault, not ours // Sometimes it randomly gives 403 Forbidden. API's fault, not ours
// We check for this below // We check for this below
if !(resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusForbidden) { if !(resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusForbidden) {
content, err := ioutil.ReadAll(resp.Body) content, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
panic(err) panic(err)
} }
return APIUser{}, fmt.Errorf("response status %s: %s", resp.Status, content) return APIUser{}, fmt.Errorf("response status %s: %s", resp.Status, content)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return APIUser{}, fmt.Errorf("Error retrieving API response to GetUser(%s):\n %w", handle, err) return APIUser{}, fmt.Errorf("Error retrieving API response to GetUser(%s):\n %w", handle, err)
} }
@ -270,14 +270,14 @@ func (api API) Search(query string, cursor string) (TweetResponse, error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
content, err := ioutil.ReadAll(resp.Body) content, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
panic(err) panic(err)
} }
return TweetResponse{}, fmt.Errorf("Error while searching for %q. HTTP %s: %s", req.URL, resp.Status, content) return TweetResponse{}, fmt.Errorf("Error while searching for %q. HTTP %s: %s", req.URL, resp.Status, content)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return TweetResponse{}, fmt.Errorf("Error retrieving API response for Search(%q):\n %w", query, err) return TweetResponse{}, fmt.Errorf("Error retrieving API response for Search(%q):\n %w", query, err)
} }

16
scraper/api_types_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"testing" "testing"
"io/ioutil" "os"
"encoding/json" "encoding/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -42,7 +42,7 @@ func TestNormalizeContent(t *testing.T) {
} }
for _, v := range test_cases { for _, v := range test_cases {
data, err := ioutil.ReadFile(v.filename) data, err := os.ReadFile(v.filename)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -63,7 +63,7 @@ func TestNormalizeContent(t *testing.T) {
func TestUserProfileToAPIUser(t *testing.T) { func TestUserProfileToAPIUser(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/michael_malice_user_profile.json") data, err := os.ReadFile("test_responses/michael_malice_user_profile.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -79,7 +79,7 @@ func TestUserProfileToAPIUser(t *testing.T) {
func TestGetCursor(t *testing.T) { func TestGetCursor(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/midriffs_anarchist_cookbook.json") data, err := os.ReadFile("test_responses/midriffs_anarchist_cookbook.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -102,7 +102,7 @@ func TestIsEndOfFeed(t *testing.T) {
{"test_responses/kwiber_end_of_feed.json", true}, {"test_responses/kwiber_end_of_feed.json", true},
} }
for _, v := range test_cases { for _, v := range test_cases {
data, err := ioutil.ReadFile(v.filename) data, err := os.ReadFile(v.filename)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -116,7 +116,7 @@ func TestIsEndOfFeed(t *testing.T) {
func TestHandleTombstonesHidden(t *testing.T) { func TestHandleTombstonesHidden(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tombstones/tombstone_hidden_1.json") data, err := os.ReadFile("test_responses/tombstones/tombstone_hidden_1.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -146,7 +146,7 @@ func TestHandleTombstonesHidden(t *testing.T) {
func TestHandleTombstonesDeleted(t *testing.T) { func TestHandleTombstonesDeleted(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tombstones/tombstone_deleted.json") data, err := os.ReadFile("test_responses/tombstones/tombstone_deleted.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -169,7 +169,7 @@ func TestHandleTombstonesDeleted(t *testing.T) {
func TestHandleTombstonesUnavailable(t *testing.T) { func TestHandleTombstonesUnavailable(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tombstones/tombstone_unavailable.json") data, err := os.ReadFile("test_responses/tombstones/tombstone_unavailable.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

10
scraper/api_types_v2.go
View File

@ -1,13 +1,13 @@
package scraper package scraper
import ( import (
"encoding/json"
"fmt" "fmt"
"io"
"net/http" "net/http"
"net/url" "net/url"
"io/ioutil"
"time"
"encoding/json"
"strings" "strings"
"time"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@ -397,7 +397,7 @@ func (api API) GetGraphqlFeedFor(user_id UserID, cursor string) (APIV2Response,
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
content, err := ioutil.ReadAll(resp.Body) content, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -408,7 +408,7 @@ func (api API) GetGraphqlFeedFor(user_id UserID, cursor string) (APIV2Response,
return APIV2Response{}, fmt.Errorf("HTTP %s\n%s\n%s", resp.Status, s, content) return APIV2Response{}, fmt.Errorf("HTTP %s\n%s\n%s", resp.Status, s, content)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return APIV2Response{}, fmt.Errorf("Error reading HTTP response body:\n %w", err) return APIV2Response{}, fmt.Errorf("Error reading HTTP response body:\n %w", err)
} }

32
scraper/api_types_v2_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"testing" "testing"
"io/ioutil" "os"
"encoding/json" "encoding/json"
"fmt" "fmt"
@ -16,7 +16,7 @@ import (
* Parse an APIV2User * Parse an APIV2User
*/ */
func TestAPIV2ParseUser(t *testing.T) { func TestAPIV2ParseUser(t *testing.T) {
data, err := ioutil.ReadFile("test_responses/api_v2/user_michael_malice.json") data, err := os.ReadFile("test_responses/api_v2/user_michael_malice.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -53,7 +53,7 @@ func TestAPIV2ParseUser(t *testing.T) {
* Parse a plain text tweet * Parse a plain text tweet
*/ */
func TestAPIV2ParseTweet(t *testing.T) { func TestAPIV2ParseTweet(t *testing.T) {
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_plaintext.json") data, err := os.ReadFile("test_responses/api_v2/tweet_plaintext.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -102,7 +102,7 @@ func TestAPIV2ParseTweet(t *testing.T) {
*/ */
func TestAPIV2ParseTweetWithQuotedTweet(t *testing.T) { func TestAPIV2ParseTweetWithQuotedTweet(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_with_quoted_tweet.json") data, err := os.ReadFile("test_responses/api_v2/tweet_with_quoted_tweet.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -156,7 +156,7 @@ func TestAPIV2ParseTweetWithQuotedTweet(t *testing.T) {
*/ */
func TestAPIV2ParseRetweet(t *testing.T) { func TestAPIV2ParseRetweet(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/retweet.json") data, err := os.ReadFile("test_responses/api_v2/retweet.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -216,7 +216,7 @@ func TestAPIV2ParseRetweet(t *testing.T) {
*/ */
func TestAPIV2ParseRetweetedQuoteTweet(t *testing.T) { func TestAPIV2ParseRetweetedQuoteTweet(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/retweet_with_quote_tweet.json") data, err := os.ReadFile("test_responses/api_v2/retweet_with_quote_tweet.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -276,7 +276,7 @@ func TestAPIV2ParseRetweetedQuoteTweet(t *testing.T) {
*/ */
func TestAPIV2ParseTweetWithQuotedTombstone(t *testing.T) { func TestAPIV2ParseTweetWithQuotedTombstone(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_with_quoted_tombstone.json") data, err := os.ReadFile("test_responses/api_v2/tweet_with_quoted_tombstone.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -312,7 +312,7 @@ func TestAPIV2ParseTweetWithQuotedTombstone(t *testing.T) {
*/ */
func TestAPIV2ParseTweetWithURL(t *testing.T) { func TestAPIV2ParseTweetWithURL(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_with_url.json") data, err := os.ReadFile("test_responses/api_v2/tweet_with_url.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -349,7 +349,7 @@ func TestAPIV2ParseTweetWithURL(t *testing.T) {
*/ */
func TestAPIV2ParseTweetWithURLPlayerCard(t *testing.T) { func TestAPIV2ParseTweetWithURLPlayerCard(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_with_url_player_card.json") data, err := os.ReadFile("test_responses/api_v2/tweet_with_url_player_card.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -381,7 +381,7 @@ func TestAPIV2ParseTweetWithURLPlayerCard(t *testing.T) {
*/ */
func TestAPIV2ParseTweetWithURLRetweet(t *testing.T) { func TestAPIV2ParseTweetWithURLRetweet(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/retweet_with_url.json") data, err := os.ReadFile("test_responses/api_v2/retweet_with_url.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -408,7 +408,7 @@ func TestAPIV2ParseTweetWithURLRetweet(t *testing.T) {
*/ */
func TestAPIV2ParseTweetWithPoll(t *testing.T) { func TestAPIV2ParseTweetWithPoll(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_with_poll.json") data, err := os.ReadFile("test_responses/api_v2/tweet_with_poll.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -444,7 +444,7 @@ func TestAPIV2ParseTweetWithPoll(t *testing.T) {
func TestParseAPIV2UserFeed(t *testing.T) { func TestParseAPIV2UserFeed(t *testing.T) {
data, err := ioutil.ReadFile("test_responses/api_v2/user_feed_apiv2.json") data, err := os.ReadFile("test_responses/api_v2/user_feed_apiv2.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -501,7 +501,7 @@ func TestParseAPIV2UserFeed(t *testing.T) {
*/ */
func TestAPIV2FeedIsEmpty(t *testing.T) { func TestAPIV2FeedIsEmpty(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/empty_response.json") data, err := os.ReadFile("test_responses/api_v2/empty_response.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -528,7 +528,7 @@ func TestAPIV2FeedIsEmpty(t *testing.T) {
*/ */
func TestAPIV2GetMainInstructionFromFeed(t *testing.T) { func TestAPIV2GetMainInstructionFromFeed(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/user_feed_apiv2.json") data, err := os.ReadFile("test_responses/api_v2/user_feed_apiv2.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -555,7 +555,7 @@ func TestAPIV2GetMainInstructionFromFeed(t *testing.T) {
*/ */
func TestAPIV2TombstoneEntry(t *testing.T) { func TestAPIV2TombstoneEntry(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tombstone_tweet.json") data, err := os.ReadFile("test_responses/api_v2/tombstone_tweet.json")
require.NoError(t, err) require.NoError(t, err)
var tweet_result APIV2Result var tweet_result APIV2Result
@ -571,7 +571,7 @@ func TestAPIV2TombstoneEntry(t *testing.T) {
func TestTweetWithWarning(t *testing.T) { func TestTweetWithWarning(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/api_v2/tweet_with_warning.json") data, err := os.ReadFile("test_responses/api_v2/tweet_with_warning.json")
require.NoError(t, err) require.NoError(t, err)
var tweet_result APIV2Result var tweet_result APIV2Result
err = json.Unmarshal(data, &tweet_result) err = json.Unmarshal(data, &tweet_result)

17
scraper/guest_token.go
View File

@ -1,11 +1,12 @@
package scraper package scraper
import "fmt" import (
import "time" "encoding/json"
"fmt"
import "io/ioutil" "io"
import "net/http" "net/http"
import "encoding/json" "time"
)
type GuestTokenResponse struct { type GuestTokenResponse struct {
Token string `json:"guest_token"` Token string `json:"guest_token"`
@ -34,14 +35,14 @@ func GetGuestToken() (string, error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
content, err := ioutil.ReadAll(resp.Body) content, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
panic(err) panic(err)
} }
return "", fmt.Errorf("HTTP %s: %s", resp.Status, content) return "", fmt.Errorf("HTTP %s: %s", resp.Status, content)
} }
body, err := ioutil.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", fmt.Errorf("Error reading HTTP response body:\n %w", err) return "", fmt.Errorf("Error reading HTTP response body:\n %w", err)
} }

4
scraper/guest_token_test.go
View File

@ -1,8 +1,9 @@
package scraper_test package scraper_test
import ( import (
"testing"
"fmt" "fmt"
"testing"
. "offline_twitter/scraper" . "offline_twitter/scraper"
) )
@ -19,7 +20,6 @@ func TestGetGuestToken(t *testing.T) {
fmt.Println(token) fmt.Println(token)
} }
// Tests the caching. Should run much much faster than an HTTP request, since all requests // Tests the caching. Should run much much faster than an HTTP request, since all requests
// other than the first use the cache. // other than the first use the cache.
func BenchmarkGetGuestToken(b *testing.B) { func BenchmarkGetGuestToken(b *testing.B) {

4
scraper/image_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"testing" "testing"
"io/ioutil" "os"
"encoding/json" "encoding/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -13,7 +13,7 @@ import (
func TestParseAPIMedia(t *testing.T) { func TestParseAPIMedia(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/image.json") data, err := os.ReadFile("test_responses/tweet_content/image.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

6
scraper/poll_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"testing" "testing"
"io/ioutil" "os"
"encoding/json" "encoding/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -13,7 +13,7 @@ import (
func TestParsePoll2Choices(t *testing.T) { func TestParsePoll2Choices(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/poll_card_2_options.json") data, err := os.ReadFile("test_responses/tweet_content/poll_card_2_options.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -37,7 +37,7 @@ func TestParsePoll2Choices(t *testing.T) {
func TestParsePoll4Choices(t *testing.T) { func TestParsePoll4Choices(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/poll_card_4_options_ended.json") data, err := os.ReadFile("test_responses/tweet_content/poll_card_4_options_ended.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

4
scraper/retweet_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"encoding/json" "encoding/json"
"io/ioutil" "os"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -13,7 +13,7 @@ import (
func TestParseSingleRetweet(t *testing.T) { func TestParseSingleRetweet(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_that_is_a_retweet.json") data, err := os.ReadFile("test_responses/tweet_that_is_a_retweet.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

8
scraper/tweet_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"encoding/json" "encoding/json"
"io/ioutil" "os"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -12,7 +12,7 @@ import (
) )
func load_tweet_from_file(filename string) Tweet{ func load_tweet_from_file(filename string) Tweet{
data, err := ioutil.ReadFile(filename) data, err := os.ReadFile(filename)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -174,7 +174,7 @@ func TestTweetWithPoll(t *testing.T) {
func TestParseTweetResponse(t *testing.T) { func TestParseTweetResponse(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/michael_malice_feed.json") data, err := os.ReadFile("test_responses/michael_malice_feed.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -193,7 +193,7 @@ func TestParseTweetResponse(t *testing.T) {
func TestParseTweetResponseWithTombstones(t *testing.T) { func TestParseTweetResponseWithTombstones(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tombstones/tombstone_deleted.json") data, err := os.ReadFile("test_responses/tombstones/tombstone_deleted.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

10
scraper/url_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"testing" "testing"
"io/ioutil" "os"
"encoding/json" "encoding/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -13,7 +13,7 @@ import (
func TestParseAPIUrlCard(t *testing.T) { func TestParseAPIUrlCard(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/url_card.json") data, err := os.ReadFile("test_responses/tweet_content/url_card.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -38,7 +38,7 @@ func TestParseAPIUrlCard(t *testing.T) {
func TestParseAPIUrlCardWithPlayer(t *testing.T) { func TestParseAPIUrlCardWithPlayer(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/url_card_with_player.json") data, err := os.ReadFile("test_responses/tweet_content/url_card_with_player.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -60,7 +60,7 @@ func TestParseAPIUrlCardWithPlayer(t *testing.T) {
func TestParseAPIUrlCardWithPlayerAndPlaceholderThumbnail(t *testing.T) { func TestParseAPIUrlCardWithPlayerAndPlaceholderThumbnail(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/url_card_with_player_placeholder_image.json") data, err := os.ReadFile("test_responses/tweet_content/url_card_with_player_placeholder_image.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -82,7 +82,7 @@ func TestParseAPIUrlCardWithPlayerAndPlaceholderThumbnail(t *testing.T) {
func TestParseAPIUrlCardWithoutThumbnail(t *testing.T) { func TestParseAPIUrlCardWithoutThumbnail(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/url_card_without_thumbnail.json") data, err := os.ReadFile("test_responses/tweet_content/url_card_without_thumbnail.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

8
scraper/user_test.go
View File

@ -3,7 +3,7 @@ package scraper_test
import ( import (
"testing" "testing"
"encoding/json" "encoding/json"
"io/ioutil" "os"
"net/http" "net/http"
"github.com/jarcoal/httpmock" "github.com/jarcoal/httpmock"
@ -15,7 +15,7 @@ import (
func TestParseSingleUser(t *testing.T) { func TestParseSingleUser(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/michael_malice_user_profile.json") data, err := os.ReadFile("test_responses/michael_malice_user_profile.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -54,7 +54,7 @@ func TestParseSingleUser(t *testing.T) {
*/ */
func TestParseBannedUser(t *testing.T) { func TestParseBannedUser(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/suspended_user.json") data, err := os.ReadFile("test_responses/suspended_user.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -79,7 +79,7 @@ func TestParseBannedUser(t *testing.T) {
*/ */
func TestParseDeletedUser(t *testing.T) { func TestParseDeletedUser(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/deleted_user.json") data, err := os.ReadFile("test_responses/deleted_user.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }

4
scraper/video_test.go
View File

@ -2,7 +2,7 @@ package scraper_test
import ( import (
"testing" "testing"
"io/ioutil" "os"
"encoding/json" "encoding/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -13,7 +13,7 @@ import (
func TestParseAPIVideo(t *testing.T) { func TestParseAPIVideo(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
data, err := ioutil.ReadFile("test_responses/tweet_content/video.json") data, err := os.ReadFile("test_responses/tweet_content/video.json")
if err != nil { if err != nil {
panic(err) panic(err)
} }