From a061decd0f227aad5975236ad721f91fff901b48 Mon Sep 17 00:00:00 2001 From: Alessio Date: Sun, 30 Jul 2023 14:19:07 -0300 Subject: [PATCH] REFACTOR: Rename go module to 'gitlab.com/offline-twitter/twitter_offline_engine' in accordance with 'go get' conventions - also restructure project to use a 'pkg' directory for reusable packages --- cmd/twitter/helpers.go | 4 ++-- cmd/twitter/main.go | 4 ++-- go.mod | 2 +- {persistence => pkg/persistence}/.gitignore | 0 {persistence => pkg/persistence}/likes_queries.go | 2 +- {persistence => pkg/persistence}/likes_queries_test.go | 0 {persistence => pkg/persistence}/media_download.go | 2 +- {persistence => pkg/persistence}/media_download_test.go | 2 +- {persistence => pkg/persistence}/media_queries.go | 2 +- {persistence => pkg/persistence}/media_queries_test.go | 2 +- {persistence => pkg/persistence}/profile.go | 0 {persistence => pkg/persistence}/profile_test.go | 2 +- {persistence => pkg/persistence}/retweet_queries.go | 2 +- {persistence => pkg/persistence}/retweet_queries_test.go | 0 {persistence => pkg/persistence}/schema.sql | 0 {persistence => pkg/persistence}/session.go | 2 +- {persistence => pkg/persistence}/session_test.go | 2 +- {persistence => pkg/persistence}/space_queries.go | 2 +- {persistence => pkg/persistence}/space_queries_test.go | 2 +- {persistence => pkg/persistence}/tweet_queries.go | 2 +- {persistence => pkg/persistence}/tweet_queries_test.go | 2 +- {persistence => pkg/persistence}/tweet_trove_queries.go | 2 +- {persistence => pkg/persistence}/user_queries.go | 2 +- {persistence => pkg/persistence}/user_queries_test.go | 2 +- {persistence => pkg/persistence}/utils.go | 0 {persistence => pkg/persistence}/utils_test.go | 4 ++-- {persistence => pkg/persistence}/versions.go | 2 +- {persistence => pkg/persistence}/versions_test.go | 4 ++-- {scraper => pkg/scraper}/api_errors.go | 0 {scraper => pkg/scraper}/api_graphql_utils.go | 0 {scraper => pkg/scraper}/api_request_utils.go | 0 {scraper => pkg/scraper}/api_types.go | 0 {scraper => pkg/scraper}/api_types_posting.go | 0 {scraper => pkg/scraper}/api_types_spaces.go | 0 {scraper => pkg/scraper}/api_types_spaces_test.go | 2 +- {scraper => pkg/scraper}/api_types_test.go | 2 +- {scraper => pkg/scraper}/api_types_v2.go | 0 {scraper => pkg/scraper}/api_types_v2_test.go | 2 +- {scraper => pkg/scraper}/authentication_test.go | 2 +- {scraper => pkg/scraper}/constants.go | 0 {scraper => pkg/scraper}/guest_token.go | 0 {scraper => pkg/scraper}/guest_token_test.go | 2 +- {scraper => pkg/scraper}/image.go | 0 {scraper => pkg/scraper}/image_test.go | 2 +- {scraper => pkg/scraper}/like.go | 0 {scraper => pkg/scraper}/link_expander.go | 0 {scraper => pkg/scraper}/link_expander_test.go | 2 +- {scraper => pkg/scraper}/poll.go | 0 {scraper => pkg/scraper}/poll_test.go | 2 +- {scraper => pkg/scraper}/retweet.go | 0 {scraper => pkg/scraper}/retweet_test.go | 2 +- {scraper => pkg/scraper}/search.go | 0 {scraper => pkg/scraper}/space.go | 0 {scraper => pkg/scraper}/space_test.go | 2 +- .../conversation_thread_entry_with_show_more_button.json | 0 .../api_v2/conversation_thread_with_tombstones.json | 0 .../scraper}/test_responses/api_v2/empty_response.json | 0 .../scraper}/test_responses/api_v2/expandable_tweet.json | 0 .../scraper}/test_responses/api_v2/feed_replying_tweet.json | 0 .../test_responses/api_v2/home_conversation_entry.json | 0 .../scraper}/test_responses/api_v2/likes_feed.json | 0 .../test_responses/api_v2/response_with_inline_label.json | 0 {scraper => pkg/scraper}/test_responses/api_v2/retweet.json | 0 .../test_responses/api_v2/retweet_with_quote_tweet.json | 0 .../scraper}/test_responses/api_v2/retweet_with_url.json | 0 .../api_v2/retweet_with_visibility_results.json | 0 .../scraper}/test_responses/api_v2/tombstone_tweet.json | 0 .../api_v2/tweet_detail_with_show_more_replies_button.json | 0 .../api_v2/tweet_detail_with_tombstone_replies.json | 0 .../api_v2/tweet_detail_with_unjoined_nontombstone_tweet.json | 0 .../scraper}/test_responses/api_v2/tweet_plaintext.json | 0 .../test_responses/api_v2/tweet_with_audiospaces_card.json | 0 .../scraper}/test_responses/api_v2/tweet_with_poll.json | 0 .../test_responses/api_v2/tweet_with_quoted_tombstone.json | 0 .../test_responses/api_v2/tweet_with_quoted_tweet.json | 0 .../scraper}/test_responses/api_v2/tweet_with_url.json | 0 .../test_responses/api_v2/tweet_with_url_player_card.json | 0 .../scraper}/test_responses/api_v2/tweet_with_warning.json | 0 .../scraper}/test_responses/api_v2/user_feed_apiv2.json | 0 .../api_v2/user_feed_profile_conversation_module_entry.json | 0 .../test_responses/api_v2/user_feed_tombstone_entry.json | 0 .../scraper}/test_responses/api_v2/user_michael_malice.json | 0 {scraper => pkg/scraper}/test_responses/deleted_user.json | 0 .../scraper}/test_responses/kwiber_end_of_feed.json | 0 .../scraper}/test_responses/michael_malice_feed.json | 0 .../scraper}/test_responses/michael_malice_user_profile.json | 0 .../scraper}/test_responses/midriffs_anarchist_cookbook.json | 0 .../test_responses/single_tweets/tweet_that_is_a_reply.json | 0 .../single_tweets/tweet_that_is_a_reply_with_gif.json | 0 .../test_responses/single_tweets/tweet_with_2_videos.json | 0 .../test_responses/single_tweets/tweet_with_4_images.json | 0 .../single_tweets/tweet_with_at_mentions_in_front.json | 0 .../single_tweets/tweet_with_html_entities.json | 0 .../test_responses/single_tweets/tweet_with_image.json | 0 .../single_tweets/tweet_with_image_and_video.json | 0 .../single_tweets/tweet_with_multiple_urls.json | 0 .../single_tweets/tweet_with_poll_4_choices.json | 0 .../single_tweets/tweet_with_quoted_tweet_and_url.json | 0 .../single_tweets/tweet_with_quoted_tweet_as_link.json | 0 .../single_tweets/tweet_with_quoted_tweet_as_link2.json | 0 .../single_tweets/tweet_with_quoted_tweet_as_link3.json | 0 .../test_responses/single_tweets/tweet_with_space_card.json | 0 .../single_tweets/tweet_with_unicode_chars.json | 0 .../single_tweets/tweet_with_url_but_no_card.json | 0 .../test_responses/single_tweets/tweet_with_url_card.json | 0 .../test_responses/single_tweets/tweet_with_video.json | 0 {scraper => pkg/scraper}/test_responses/suspended_user.json | 0 .../scraper}/test_responses/tombstones/tombstone_deleted.json | 0 .../test_responses/tombstones/tombstone_hidden_1.json | 0 .../test_responses/tombstones/tombstone_unavailable.json | 0 .../scraper}/test_responses/tweet_content/image.json | 0 .../test_responses/tweet_content/poll_card_2_options.json | 0 .../tweet_content/poll_card_4_options_ended.json | 0 .../scraper}/test_responses/tweet_content/space.json | 0 .../scraper}/test_responses/tweet_content/space_object.json | 0 .../test_responses/tweet_content/space_object_empty.json | 0 .../scraper}/test_responses/tweet_content/url_card.json | 0 .../test_responses/tweet_content/url_card_with_player.json | 0 .../tweet_content/url_card_with_player_placeholder_image.json | 0 .../tweet_content/url_card_without_thumbnail.json | 0 .../scraper}/test_responses/tweet_content/video.json | 0 .../scraper}/test_responses/tweet_that_is_a_retweet.json | 0 {scraper => pkg/scraper}/timestamp_type.go | 0 {scraper => pkg/scraper}/tweet.go | 2 +- {scraper => pkg/scraper}/tweet_test.go | 2 +- {scraper => pkg/scraper}/tweet_trove.go | 0 {scraper => pkg/scraper}/tweet_trove_test.go | 2 +- {scraper => pkg/scraper}/url.go | 0 {scraper => pkg/scraper}/url_test.go | 2 +- {scraper => pkg/scraper}/user.go | 2 +- {scraper => pkg/scraper}/user_feed.go | 0 {scraper => pkg/scraper}/user_test.go | 2 +- {scraper => pkg/scraper}/video.go | 0 {scraper => pkg/scraper}/video_test.go | 2 +- {terminal_utils => pkg/terminal_utils}/colors.go | 0 {terminal_utils => pkg/terminal_utils}/formatting.go | 0 {terminal_utils => pkg/terminal_utils}/formatting_test.go | 2 +- 137 files changed, 44 insertions(+), 44 deletions(-) rename {persistence => pkg/persistence}/.gitignore (100%) rename {persistence => pkg/persistence}/likes_queries.go (91%) rename {persistence => pkg/persistence}/likes_queries_test.go (100%) rename {persistence => pkg/persistence}/media_download.go (99%) rename {persistence => pkg/persistence}/media_download_test.go (98%) rename {persistence => pkg/persistence}/media_queries.go (98%) rename {persistence => pkg/persistence}/media_queries_test.go (99%) rename {persistence => pkg/persistence}/profile.go (100%) rename {persistence => pkg/persistence}/profile_test.go (97%) rename {persistence => pkg/persistence}/retweet_queries.go (93%) rename {persistence => pkg/persistence}/retweet_queries_test.go (100%) rename {persistence => pkg/persistence}/schema.sql (100%) rename {persistence => pkg/persistence}/session.go (91%) rename {persistence => pkg/persistence}/session_test.go (92%) rename {persistence => pkg/persistence}/space_queries.go (97%) rename {persistence => pkg/persistence}/space_queries_test.go (97%) rename {persistence => pkg/persistence}/tweet_queries.go (98%) rename {persistence => pkg/persistence}/tweet_queries_test.go (99%) rename {persistence => pkg/persistence}/tweet_trove_queries.go (96%) rename {persistence => pkg/persistence}/user_queries.go (99%) rename {persistence => pkg/persistence}/user_queries_test.go (99%) rename {persistence => pkg/persistence}/utils.go (100%) rename {persistence => pkg/persistence}/utils_test.go (98%) rename {persistence => pkg/persistence}/versions.go (99%) rename {persistence => pkg/persistence}/versions_test.go (87%) rename {scraper => pkg/scraper}/api_errors.go (100%) rename {scraper => pkg/scraper}/api_graphql_utils.go (100%) rename {scraper => pkg/scraper}/api_request_utils.go (100%) rename {scraper => pkg/scraper}/api_types.go (100%) rename {scraper => pkg/scraper}/api_types_posting.go (100%) rename {scraper => pkg/scraper}/api_types_spaces.go (100%) rename {scraper => pkg/scraper}/api_types_spaces_test.go (96%) rename {scraper => pkg/scraper}/api_types_test.go (99%) rename {scraper => pkg/scraper}/api_types_v2.go (100%) rename {scraper => pkg/scraper}/api_types_v2_test.go (99%) rename {scraper => pkg/scraper}/authentication_test.go (94%) rename {scraper => pkg/scraper}/constants.go (100%) rename {scraper => pkg/scraper}/guest_token.go (100%) rename {scraper => pkg/scraper}/guest_token_test.go (90%) rename {scraper => pkg/scraper}/image.go (100%) rename {scraper => pkg/scraper}/image_test.go (91%) rename {scraper => pkg/scraper}/like.go (100%) rename {scraper => pkg/scraper}/link_expander.go (100%) rename {scraper => pkg/scraper}/link_expander_test.go (86%) rename {scraper => pkg/scraper}/poll.go (100%) rename {scraper => pkg/scraper}/poll_test.go (96%) rename {scraper => pkg/scraper}/retweet.go (100%) rename {scraper => pkg/scraper}/retweet_test.go (91%) rename {scraper => pkg/scraper}/search.go (100%) rename {scraper => pkg/scraper}/space.go (100%) rename {scraper => pkg/scraper}/space_test.go (88%) rename {scraper => pkg/scraper}/test_responses/api_v2/conversation_thread_entry_with_show_more_button.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/conversation_thread_with_tombstones.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/empty_response.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/expandable_tweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/feed_replying_tweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/home_conversation_entry.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/likes_feed.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/response_with_inline_label.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/retweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/retweet_with_quote_tweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/retweet_with_url.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/retweet_with_visibility_results.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tombstone_tweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_detail_with_show_more_replies_button.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_detail_with_tombstone_replies.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_detail_with_unjoined_nontombstone_tweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_plaintext.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_audiospaces_card.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_poll.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_quoted_tombstone.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_quoted_tweet.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_url.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_url_player_card.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/tweet_with_warning.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/user_feed_apiv2.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/user_feed_profile_conversation_module_entry.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/user_feed_tombstone_entry.json (100%) rename {scraper => pkg/scraper}/test_responses/api_v2/user_michael_malice.json (100%) rename {scraper => pkg/scraper}/test_responses/deleted_user.json (100%) rename {scraper => pkg/scraper}/test_responses/kwiber_end_of_feed.json (100%) rename {scraper => pkg/scraper}/test_responses/michael_malice_feed.json (100%) rename {scraper => pkg/scraper}/test_responses/michael_malice_user_profile.json (100%) rename {scraper => pkg/scraper}/test_responses/midriffs_anarchist_cookbook.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_that_is_a_reply.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_that_is_a_reply_with_gif.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_2_videos.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_4_images.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_at_mentions_in_front.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_html_entities.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_image.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_image_and_video.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_multiple_urls.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_poll_4_choices.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_quoted_tweet_and_url.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_quoted_tweet_as_link.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_quoted_tweet_as_link2.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_quoted_tweet_as_link3.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_space_card.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_unicode_chars.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_url_but_no_card.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_url_card.json (100%) rename {scraper => pkg/scraper}/test_responses/single_tweets/tweet_with_video.json (100%) rename {scraper => pkg/scraper}/test_responses/suspended_user.json (100%) rename {scraper => pkg/scraper}/test_responses/tombstones/tombstone_deleted.json (100%) rename {scraper => pkg/scraper}/test_responses/tombstones/tombstone_hidden_1.json (100%) rename {scraper => pkg/scraper}/test_responses/tombstones/tombstone_unavailable.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/image.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/poll_card_2_options.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/poll_card_4_options_ended.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/space.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/space_object.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/space_object_empty.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/url_card.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/url_card_with_player.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/url_card_with_player_placeholder_image.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/url_card_without_thumbnail.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_content/video.json (100%) rename {scraper => pkg/scraper}/test_responses/tweet_that_is_a_retweet.json (100%) rename {scraper => pkg/scraper}/timestamp_type.go (100%) rename {scraper => pkg/scraper}/tweet.go (99%) rename {scraper => pkg/scraper}/tweet_test.go (99%) rename {scraper => pkg/scraper}/tweet_trove.go (100%) rename {scraper => pkg/scraper}/tweet_trove_test.go (96%) rename {scraper => pkg/scraper}/url.go (100%) rename {scraper => pkg/scraper}/url_test.go (98%) rename {scraper => pkg/scraper}/user.go (98%) rename {scraper => pkg/scraper}/user_feed.go (100%) rename {scraper => pkg/scraper}/user_test.go (98%) rename {scraper => pkg/scraper}/video.go (100%) rename {scraper => pkg/scraper}/video_test.go (94%) rename {terminal_utils => pkg/terminal_utils}/colors.go (100%) rename {terminal_utils => pkg/terminal_utils}/formatting.go (100%) rename {terminal_utils => pkg/terminal_utils}/formatting_test.go (96%) diff --git a/cmd/twitter/helpers.go b/cmd/twitter/helpers.go index 8d677b0..9921635 100644 --- a/cmd/twitter/helpers.go +++ b/cmd/twitter/helpers.go @@ -6,8 +6,8 @@ import ( "os" "strconv" - "offline_twitter/scraper" - "offline_twitter/terminal_utils" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/terminal_utils" ) /** diff --git a/cmd/twitter/main.go b/cmd/twitter/main.go index 2a37311..37c8e2f 100644 --- a/cmd/twitter/main.go +++ b/cmd/twitter/main.go @@ -9,8 +9,8 @@ import ( "strings" "syscall" - "offline_twitter/persistence" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/persistence" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/go.mod b/go.mod index bbe33e0..836c6cf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module offline_twitter +module gitlab.com/offline-twitter/twitter_offline_engine go 1.16 diff --git a/persistence/.gitignore b/pkg/persistence/.gitignore similarity index 100% rename from persistence/.gitignore rename to pkg/persistence/.gitignore diff --git a/persistence/likes_queries.go b/pkg/persistence/likes_queries.go similarity index 91% rename from persistence/likes_queries.go rename to pkg/persistence/likes_queries.go index 0a14842..50f1e96 100644 --- a/persistence/likes_queries.go +++ b/pkg/persistence/likes_queries.go @@ -3,7 +3,7 @@ package persistence import ( "fmt" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func (p Profile) SaveLike(l scraper.Like) error { diff --git a/persistence/likes_queries_test.go b/pkg/persistence/likes_queries_test.go similarity index 100% rename from persistence/likes_queries_test.go rename to pkg/persistence/likes_queries_test.go diff --git a/persistence/media_download.go b/pkg/persistence/media_download.go similarity index 99% rename from persistence/media_download.go rename to pkg/persistence/media_download.go index e79ff53..3ac7c8c 100644 --- a/persistence/media_download.go +++ b/pkg/persistence/media_download.go @@ -10,7 +10,7 @@ import ( "path" "strings" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) type MediaDownloader interface { diff --git a/persistence/media_download_test.go b/pkg/persistence/media_download_test.go similarity index 98% rename from persistence/media_download_test.go rename to pkg/persistence/media_download_test.go index 0909b9a..d991e15 100644 --- a/persistence/media_download_test.go +++ b/pkg/persistence/media_download_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/media_queries.go b/pkg/persistence/media_queries.go similarity index 98% rename from persistence/media_queries.go rename to pkg/persistence/media_queries.go index 98e6431..0e78070 100644 --- a/persistence/media_queries.go +++ b/pkg/persistence/media_queries.go @@ -3,7 +3,7 @@ package persistence import ( "fmt" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/media_queries_test.go b/pkg/persistence/media_queries_test.go similarity index 99% rename from persistence/media_queries_test.go rename to pkg/persistence/media_queries_test.go index b175177..448bf47 100644 --- a/persistence/media_queries_test.go +++ b/pkg/persistence/media_queries_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-test/deep" "github.com/stretchr/testify/require" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/profile.go b/pkg/persistence/profile.go similarity index 100% rename from persistence/profile.go rename to pkg/persistence/profile.go diff --git a/persistence/profile_test.go b/pkg/persistence/profile_test.go similarity index 97% rename from persistence/profile_test.go rename to pkg/persistence/profile_test.go index 9b70ea7..4e62e81 100644 --- a/persistence/profile_test.go +++ b/pkg/persistence/profile_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "offline_twitter/persistence" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/persistence" ) // DUPE 1 diff --git a/persistence/retweet_queries.go b/pkg/persistence/retweet_queries.go similarity index 93% rename from persistence/retweet_queries.go rename to pkg/persistence/retweet_queries.go index c236ace..308713d 100644 --- a/persistence/retweet_queries.go +++ b/pkg/persistence/retweet_queries.go @@ -3,7 +3,7 @@ package persistence import ( "fmt" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/retweet_queries_test.go b/pkg/persistence/retweet_queries_test.go similarity index 100% rename from persistence/retweet_queries_test.go rename to pkg/persistence/retweet_queries_test.go diff --git a/persistence/schema.sql b/pkg/persistence/schema.sql similarity index 100% rename from persistence/schema.sql rename to pkg/persistence/schema.sql diff --git a/persistence/session.go b/pkg/persistence/session.go similarity index 91% rename from persistence/session.go rename to pkg/persistence/session.go index a8412f0..d659c16 100644 --- a/persistence/session.go +++ b/pkg/persistence/session.go @@ -2,7 +2,7 @@ package persistence import ( "encoding/json" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" "os" log "github.com/sirupsen/logrus" diff --git a/persistence/session_test.go b/pkg/persistence/session_test.go similarity index 92% rename from persistence/session_test.go rename to pkg/persistence/session_test.go index ded198c..2011b1a 100644 --- a/persistence/session_test.go +++ b/pkg/persistence/session_test.go @@ -2,10 +2,10 @@ package persistence_test import ( "fmt" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" "math/rand" "net/http" "net/http/cookiejar" - "offline_twitter/scraper" "testing" "time" diff --git a/persistence/space_queries.go b/pkg/persistence/space_queries.go similarity index 97% rename from persistence/space_queries.go rename to pkg/persistence/space_queries.go index 75d6395..de48687 100644 --- a/persistence/space_queries.go +++ b/pkg/persistence/space_queries.go @@ -4,7 +4,7 @@ import ( "database/sql" "errors" "fmt" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) type SpaceParticipant struct { diff --git a/persistence/space_queries_test.go b/pkg/persistence/space_queries_test.go similarity index 97% rename from persistence/space_queries_test.go rename to pkg/persistence/space_queries_test.go index f224471..eea80f9 100644 --- a/persistence/space_queries_test.go +++ b/pkg/persistence/space_queries_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" "github.com/go-test/deep" "math/rand" diff --git a/persistence/tweet_queries.go b/pkg/persistence/tweet_queries.go similarity index 98% rename from persistence/tweet_queries.go rename to pkg/persistence/tweet_queries.go index f09625e..62d5abd 100644 --- a/persistence/tweet_queries.go +++ b/pkg/persistence/tweet_queries.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func (p Profile) SaveTweet(t scraper.Tweet) error { diff --git a/persistence/tweet_queries_test.go b/pkg/persistence/tweet_queries_test.go similarity index 99% rename from persistence/tweet_queries_test.go rename to pkg/persistence/tweet_queries_test.go index 5da2925..7d6e337 100644 --- a/persistence/tweet_queries_test.go +++ b/pkg/persistence/tweet_queries_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-test/deep" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/tweet_trove_queries.go b/pkg/persistence/tweet_trove_queries.go similarity index 96% rename from persistence/tweet_trove_queries.go rename to pkg/persistence/tweet_trove_queries.go index 6b5f554..846ccd2 100644 --- a/persistence/tweet_trove_queries.go +++ b/pkg/persistence/tweet_trove_queries.go @@ -3,7 +3,7 @@ package persistence import ( "fmt" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/user_queries.go b/pkg/persistence/user_queries.go similarity index 99% rename from persistence/user_queries.go rename to pkg/persistence/user_queries.go index c78b3ee..e9b7cf9 100644 --- a/persistence/user_queries.go +++ b/pkg/persistence/user_queries.go @@ -6,7 +6,7 @@ import ( "fmt" "path" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/user_queries_test.go b/pkg/persistence/user_queries_test.go similarity index 99% rename from persistence/user_queries_test.go rename to pkg/persistence/user_queries_test.go index e15ca46..a484353 100644 --- a/persistence/user_queries_test.go +++ b/pkg/persistence/user_queries_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/utils.go b/pkg/persistence/utils.go similarity index 100% rename from persistence/utils.go rename to pkg/persistence/utils.go diff --git a/persistence/utils_test.go b/pkg/persistence/utils_test.go similarity index 98% rename from persistence/utils_test.go rename to pkg/persistence/utils_test.go index 48c9fb6..a11e7d9 100644 --- a/persistence/utils_test.go +++ b/pkg/persistence/utils_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "time" - "offline_twitter/persistence" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/persistence" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/persistence/versions.go b/pkg/persistence/versions.go similarity index 99% rename from persistence/versions.go rename to pkg/persistence/versions.go index ce94b69..0e57610 100644 --- a/persistence/versions.go +++ b/pkg/persistence/versions.go @@ -5,7 +5,7 @@ import ( sql "github.com/jmoiron/sqlx" - "offline_twitter/terminal_utils" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/terminal_utils" ) type VersionMismatchError struct { diff --git a/persistence/versions_test.go b/pkg/persistence/versions_test.go similarity index 87% rename from persistence/versions_test.go rename to pkg/persistence/versions_test.go index 728b639..7003494 100644 --- a/persistence/versions_test.go +++ b/pkg/persistence/versions_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "offline_twitter/persistence" - "offline_twitter/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/persistence" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestVersionUpgrade(t *testing.T) { diff --git a/scraper/api_errors.go b/pkg/scraper/api_errors.go similarity index 100% rename from scraper/api_errors.go rename to pkg/scraper/api_errors.go diff --git a/scraper/api_graphql_utils.go b/pkg/scraper/api_graphql_utils.go similarity index 100% rename from scraper/api_graphql_utils.go rename to pkg/scraper/api_graphql_utils.go diff --git a/scraper/api_request_utils.go b/pkg/scraper/api_request_utils.go similarity index 100% rename from scraper/api_request_utils.go rename to pkg/scraper/api_request_utils.go diff --git a/scraper/api_types.go b/pkg/scraper/api_types.go similarity index 100% rename from scraper/api_types.go rename to pkg/scraper/api_types.go diff --git a/scraper/api_types_posting.go b/pkg/scraper/api_types_posting.go similarity index 100% rename from scraper/api_types_posting.go rename to pkg/scraper/api_types_posting.go diff --git a/scraper/api_types_spaces.go b/pkg/scraper/api_types_spaces.go similarity index 100% rename from scraper/api_types_spaces.go rename to pkg/scraper/api_types_spaces.go diff --git a/scraper/api_types_spaces_test.go b/pkg/scraper/api_types_spaces_test.go similarity index 96% rename from scraper/api_types_spaces_test.go rename to pkg/scraper/api_types_spaces_test.go index 09f4980..7974fe3 100644 --- a/scraper/api_types_spaces_test.go +++ b/pkg/scraper/api_types_spaces_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseSpaceResponse(t *testing.T) { diff --git a/scraper/api_types_test.go b/pkg/scraper/api_types_test.go similarity index 99% rename from scraper/api_types_test.go rename to pkg/scraper/api_types_test.go index 3408ca0..04d433f 100644 --- a/scraper/api_types_test.go +++ b/pkg/scraper/api_types_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestNormalizeContent(t *testing.T) { diff --git a/scraper/api_types_v2.go b/pkg/scraper/api_types_v2.go similarity index 100% rename from scraper/api_types_v2.go rename to pkg/scraper/api_types_v2.go diff --git a/scraper/api_types_v2_test.go b/pkg/scraper/api_types_v2_test.go similarity index 99% rename from scraper/api_types_v2_test.go rename to pkg/scraper/api_types_v2_test.go index ccf0c35..9b302ff 100644 --- a/scraper/api_types_v2_test.go +++ b/pkg/scraper/api_types_v2_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) /** diff --git a/scraper/authentication_test.go b/pkg/scraper/authentication_test.go similarity index 94% rename from scraper/authentication_test.go rename to pkg/scraper/authentication_test.go index 977b3d4..3216cf7 100644 --- a/scraper/authentication_test.go +++ b/pkg/scraper/authentication_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) // An API object should serialize and then deserialize to give the same session state from before. diff --git a/scraper/constants.go b/pkg/scraper/constants.go similarity index 100% rename from scraper/constants.go rename to pkg/scraper/constants.go diff --git a/scraper/guest_token.go b/pkg/scraper/guest_token.go similarity index 100% rename from scraper/guest_token.go rename to pkg/scraper/guest_token.go diff --git a/scraper/guest_token_test.go b/pkg/scraper/guest_token_test.go similarity index 90% rename from scraper/guest_token_test.go rename to pkg/scraper/guest_token_test.go index 5d4677f..357bd45 100644 --- a/scraper/guest_token_test.go +++ b/pkg/scraper/guest_token_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) // Makes an HTTP request diff --git a/scraper/image.go b/pkg/scraper/image.go similarity index 100% rename from scraper/image.go rename to pkg/scraper/image.go diff --git a/scraper/image_test.go b/pkg/scraper/image_test.go similarity index 91% rename from scraper/image_test.go rename to pkg/scraper/image_test.go index 8bb14c9..ce74b31 100644 --- a/scraper/image_test.go +++ b/pkg/scraper/image_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseAPIMedia(t *testing.T) { diff --git a/scraper/like.go b/pkg/scraper/like.go similarity index 100% rename from scraper/like.go rename to pkg/scraper/like.go diff --git a/scraper/link_expander.go b/pkg/scraper/link_expander.go similarity index 100% rename from scraper/link_expander.go rename to pkg/scraper/link_expander.go diff --git a/scraper/link_expander_test.go b/pkg/scraper/link_expander_test.go similarity index 86% rename from scraper/link_expander_test.go rename to pkg/scraper/link_expander_test.go index 202ab68..46b42b0 100644 --- a/scraper/link_expander_test.go +++ b/pkg/scraper/link_expander_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestExpandShortUrl(t *testing.T) { diff --git a/scraper/poll.go b/pkg/scraper/poll.go similarity index 100% rename from scraper/poll.go rename to pkg/scraper/poll.go diff --git a/scraper/poll_test.go b/pkg/scraper/poll_test.go similarity index 96% rename from scraper/poll_test.go rename to pkg/scraper/poll_test.go index ab1ee84..c9a7385 100644 --- a/scraper/poll_test.go +++ b/pkg/scraper/poll_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParsePoll2Choices(t *testing.T) { diff --git a/scraper/retweet.go b/pkg/scraper/retweet.go similarity index 100% rename from scraper/retweet.go rename to pkg/scraper/retweet.go diff --git a/scraper/retweet_test.go b/pkg/scraper/retweet_test.go similarity index 91% rename from scraper/retweet_test.go rename to pkg/scraper/retweet_test.go index 9770c6a..baf9501 100644 --- a/scraper/retweet_test.go +++ b/pkg/scraper/retweet_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseSingleRetweet(t *testing.T) { diff --git a/scraper/search.go b/pkg/scraper/search.go similarity index 100% rename from scraper/search.go rename to pkg/scraper/search.go diff --git a/scraper/space.go b/pkg/scraper/space.go similarity index 100% rename from scraper/space.go rename to pkg/scraper/space.go diff --git a/scraper/space_test.go b/pkg/scraper/space_test.go similarity index 88% rename from scraper/space_test.go rename to pkg/scraper/space_test.go index 0b74f88..701058e 100644 --- a/scraper/space_test.go +++ b/pkg/scraper/space_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseSpace(t *testing.T) { diff --git a/scraper/test_responses/api_v2/conversation_thread_entry_with_show_more_button.json b/pkg/scraper/test_responses/api_v2/conversation_thread_entry_with_show_more_button.json similarity index 100% rename from scraper/test_responses/api_v2/conversation_thread_entry_with_show_more_button.json rename to pkg/scraper/test_responses/api_v2/conversation_thread_entry_with_show_more_button.json diff --git a/scraper/test_responses/api_v2/conversation_thread_with_tombstones.json b/pkg/scraper/test_responses/api_v2/conversation_thread_with_tombstones.json similarity index 100% rename from scraper/test_responses/api_v2/conversation_thread_with_tombstones.json rename to pkg/scraper/test_responses/api_v2/conversation_thread_with_tombstones.json diff --git a/scraper/test_responses/api_v2/empty_response.json b/pkg/scraper/test_responses/api_v2/empty_response.json similarity index 100% rename from scraper/test_responses/api_v2/empty_response.json rename to pkg/scraper/test_responses/api_v2/empty_response.json diff --git a/scraper/test_responses/api_v2/expandable_tweet.json b/pkg/scraper/test_responses/api_v2/expandable_tweet.json similarity index 100% rename from scraper/test_responses/api_v2/expandable_tweet.json rename to pkg/scraper/test_responses/api_v2/expandable_tweet.json diff --git a/scraper/test_responses/api_v2/feed_replying_tweet.json b/pkg/scraper/test_responses/api_v2/feed_replying_tweet.json similarity index 100% rename from scraper/test_responses/api_v2/feed_replying_tweet.json rename to pkg/scraper/test_responses/api_v2/feed_replying_tweet.json diff --git a/scraper/test_responses/api_v2/home_conversation_entry.json b/pkg/scraper/test_responses/api_v2/home_conversation_entry.json similarity index 100% rename from scraper/test_responses/api_v2/home_conversation_entry.json rename to pkg/scraper/test_responses/api_v2/home_conversation_entry.json diff --git a/scraper/test_responses/api_v2/likes_feed.json b/pkg/scraper/test_responses/api_v2/likes_feed.json similarity index 100% rename from scraper/test_responses/api_v2/likes_feed.json rename to pkg/scraper/test_responses/api_v2/likes_feed.json diff --git a/scraper/test_responses/api_v2/response_with_inline_label.json b/pkg/scraper/test_responses/api_v2/response_with_inline_label.json similarity index 100% rename from scraper/test_responses/api_v2/response_with_inline_label.json rename to pkg/scraper/test_responses/api_v2/response_with_inline_label.json diff --git a/scraper/test_responses/api_v2/retweet.json b/pkg/scraper/test_responses/api_v2/retweet.json similarity index 100% rename from scraper/test_responses/api_v2/retweet.json rename to pkg/scraper/test_responses/api_v2/retweet.json diff --git a/scraper/test_responses/api_v2/retweet_with_quote_tweet.json b/pkg/scraper/test_responses/api_v2/retweet_with_quote_tweet.json similarity index 100% rename from scraper/test_responses/api_v2/retweet_with_quote_tweet.json rename to pkg/scraper/test_responses/api_v2/retweet_with_quote_tweet.json diff --git a/scraper/test_responses/api_v2/retweet_with_url.json b/pkg/scraper/test_responses/api_v2/retweet_with_url.json similarity index 100% rename from scraper/test_responses/api_v2/retweet_with_url.json rename to pkg/scraper/test_responses/api_v2/retweet_with_url.json diff --git a/scraper/test_responses/api_v2/retweet_with_visibility_results.json b/pkg/scraper/test_responses/api_v2/retweet_with_visibility_results.json similarity index 100% rename from scraper/test_responses/api_v2/retweet_with_visibility_results.json rename to pkg/scraper/test_responses/api_v2/retweet_with_visibility_results.json diff --git a/scraper/test_responses/api_v2/tombstone_tweet.json b/pkg/scraper/test_responses/api_v2/tombstone_tweet.json similarity index 100% rename from scraper/test_responses/api_v2/tombstone_tweet.json rename to pkg/scraper/test_responses/api_v2/tombstone_tweet.json diff --git a/scraper/test_responses/api_v2/tweet_detail_with_show_more_replies_button.json b/pkg/scraper/test_responses/api_v2/tweet_detail_with_show_more_replies_button.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_detail_with_show_more_replies_button.json rename to pkg/scraper/test_responses/api_v2/tweet_detail_with_show_more_replies_button.json diff --git a/scraper/test_responses/api_v2/tweet_detail_with_tombstone_replies.json b/pkg/scraper/test_responses/api_v2/tweet_detail_with_tombstone_replies.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_detail_with_tombstone_replies.json rename to pkg/scraper/test_responses/api_v2/tweet_detail_with_tombstone_replies.json diff --git a/scraper/test_responses/api_v2/tweet_detail_with_unjoined_nontombstone_tweet.json b/pkg/scraper/test_responses/api_v2/tweet_detail_with_unjoined_nontombstone_tweet.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_detail_with_unjoined_nontombstone_tweet.json rename to pkg/scraper/test_responses/api_v2/tweet_detail_with_unjoined_nontombstone_tweet.json diff --git a/scraper/test_responses/api_v2/tweet_plaintext.json b/pkg/scraper/test_responses/api_v2/tweet_plaintext.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_plaintext.json rename to pkg/scraper/test_responses/api_v2/tweet_plaintext.json diff --git a/scraper/test_responses/api_v2/tweet_with_audiospaces_card.json b/pkg/scraper/test_responses/api_v2/tweet_with_audiospaces_card.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_audiospaces_card.json rename to pkg/scraper/test_responses/api_v2/tweet_with_audiospaces_card.json diff --git a/scraper/test_responses/api_v2/tweet_with_poll.json b/pkg/scraper/test_responses/api_v2/tweet_with_poll.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_poll.json rename to pkg/scraper/test_responses/api_v2/tweet_with_poll.json diff --git a/scraper/test_responses/api_v2/tweet_with_quoted_tombstone.json b/pkg/scraper/test_responses/api_v2/tweet_with_quoted_tombstone.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_quoted_tombstone.json rename to pkg/scraper/test_responses/api_v2/tweet_with_quoted_tombstone.json diff --git a/scraper/test_responses/api_v2/tweet_with_quoted_tweet.json b/pkg/scraper/test_responses/api_v2/tweet_with_quoted_tweet.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_quoted_tweet.json rename to pkg/scraper/test_responses/api_v2/tweet_with_quoted_tweet.json diff --git a/scraper/test_responses/api_v2/tweet_with_url.json b/pkg/scraper/test_responses/api_v2/tweet_with_url.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_url.json rename to pkg/scraper/test_responses/api_v2/tweet_with_url.json diff --git a/scraper/test_responses/api_v2/tweet_with_url_player_card.json b/pkg/scraper/test_responses/api_v2/tweet_with_url_player_card.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_url_player_card.json rename to pkg/scraper/test_responses/api_v2/tweet_with_url_player_card.json diff --git a/scraper/test_responses/api_v2/tweet_with_warning.json b/pkg/scraper/test_responses/api_v2/tweet_with_warning.json similarity index 100% rename from scraper/test_responses/api_v2/tweet_with_warning.json rename to pkg/scraper/test_responses/api_v2/tweet_with_warning.json diff --git a/scraper/test_responses/api_v2/user_feed_apiv2.json b/pkg/scraper/test_responses/api_v2/user_feed_apiv2.json similarity index 100% rename from scraper/test_responses/api_v2/user_feed_apiv2.json rename to pkg/scraper/test_responses/api_v2/user_feed_apiv2.json diff --git a/scraper/test_responses/api_v2/user_feed_profile_conversation_module_entry.json b/pkg/scraper/test_responses/api_v2/user_feed_profile_conversation_module_entry.json similarity index 100% rename from scraper/test_responses/api_v2/user_feed_profile_conversation_module_entry.json rename to pkg/scraper/test_responses/api_v2/user_feed_profile_conversation_module_entry.json diff --git a/scraper/test_responses/api_v2/user_feed_tombstone_entry.json b/pkg/scraper/test_responses/api_v2/user_feed_tombstone_entry.json similarity index 100% rename from scraper/test_responses/api_v2/user_feed_tombstone_entry.json rename to pkg/scraper/test_responses/api_v2/user_feed_tombstone_entry.json diff --git a/scraper/test_responses/api_v2/user_michael_malice.json b/pkg/scraper/test_responses/api_v2/user_michael_malice.json similarity index 100% rename from scraper/test_responses/api_v2/user_michael_malice.json rename to pkg/scraper/test_responses/api_v2/user_michael_malice.json diff --git a/scraper/test_responses/deleted_user.json b/pkg/scraper/test_responses/deleted_user.json similarity index 100% rename from scraper/test_responses/deleted_user.json rename to pkg/scraper/test_responses/deleted_user.json diff --git a/scraper/test_responses/kwiber_end_of_feed.json b/pkg/scraper/test_responses/kwiber_end_of_feed.json similarity index 100% rename from scraper/test_responses/kwiber_end_of_feed.json rename to pkg/scraper/test_responses/kwiber_end_of_feed.json diff --git a/scraper/test_responses/michael_malice_feed.json b/pkg/scraper/test_responses/michael_malice_feed.json similarity index 100% rename from scraper/test_responses/michael_malice_feed.json rename to pkg/scraper/test_responses/michael_malice_feed.json diff --git a/scraper/test_responses/michael_malice_user_profile.json b/pkg/scraper/test_responses/michael_malice_user_profile.json similarity index 100% rename from scraper/test_responses/michael_malice_user_profile.json rename to pkg/scraper/test_responses/michael_malice_user_profile.json diff --git a/scraper/test_responses/midriffs_anarchist_cookbook.json b/pkg/scraper/test_responses/midriffs_anarchist_cookbook.json similarity index 100% rename from scraper/test_responses/midriffs_anarchist_cookbook.json rename to pkg/scraper/test_responses/midriffs_anarchist_cookbook.json diff --git a/scraper/test_responses/single_tweets/tweet_that_is_a_reply.json b/pkg/scraper/test_responses/single_tweets/tweet_that_is_a_reply.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_that_is_a_reply.json rename to pkg/scraper/test_responses/single_tweets/tweet_that_is_a_reply.json diff --git a/scraper/test_responses/single_tweets/tweet_that_is_a_reply_with_gif.json b/pkg/scraper/test_responses/single_tweets/tweet_that_is_a_reply_with_gif.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_that_is_a_reply_with_gif.json rename to pkg/scraper/test_responses/single_tweets/tweet_that_is_a_reply_with_gif.json diff --git a/scraper/test_responses/single_tweets/tweet_with_2_videos.json b/pkg/scraper/test_responses/single_tweets/tweet_with_2_videos.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_2_videos.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_2_videos.json diff --git a/scraper/test_responses/single_tweets/tweet_with_4_images.json b/pkg/scraper/test_responses/single_tweets/tweet_with_4_images.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_4_images.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_4_images.json diff --git a/scraper/test_responses/single_tweets/tweet_with_at_mentions_in_front.json b/pkg/scraper/test_responses/single_tweets/tweet_with_at_mentions_in_front.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_at_mentions_in_front.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_at_mentions_in_front.json diff --git a/scraper/test_responses/single_tweets/tweet_with_html_entities.json b/pkg/scraper/test_responses/single_tweets/tweet_with_html_entities.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_html_entities.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_html_entities.json diff --git a/scraper/test_responses/single_tweets/tweet_with_image.json b/pkg/scraper/test_responses/single_tweets/tweet_with_image.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_image.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_image.json diff --git a/scraper/test_responses/single_tweets/tweet_with_image_and_video.json b/pkg/scraper/test_responses/single_tweets/tweet_with_image_and_video.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_image_and_video.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_image_and_video.json diff --git a/scraper/test_responses/single_tweets/tweet_with_multiple_urls.json b/pkg/scraper/test_responses/single_tweets/tweet_with_multiple_urls.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_multiple_urls.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_multiple_urls.json diff --git a/scraper/test_responses/single_tweets/tweet_with_poll_4_choices.json b/pkg/scraper/test_responses/single_tweets/tweet_with_poll_4_choices.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_poll_4_choices.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_poll_4_choices.json diff --git a/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_and_url.json b/pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_and_url.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_quoted_tweet_and_url.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_and_url.json diff --git a/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link.json b/pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link.json diff --git a/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link2.json b/pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link2.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link2.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link2.json diff --git a/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link3.json b/pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link3.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link3.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_quoted_tweet_as_link3.json diff --git a/scraper/test_responses/single_tweets/tweet_with_space_card.json b/pkg/scraper/test_responses/single_tweets/tweet_with_space_card.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_space_card.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_space_card.json diff --git a/scraper/test_responses/single_tweets/tweet_with_unicode_chars.json b/pkg/scraper/test_responses/single_tweets/tweet_with_unicode_chars.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_unicode_chars.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_unicode_chars.json diff --git a/scraper/test_responses/single_tweets/tweet_with_url_but_no_card.json b/pkg/scraper/test_responses/single_tweets/tweet_with_url_but_no_card.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_url_but_no_card.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_url_but_no_card.json diff --git a/scraper/test_responses/single_tweets/tweet_with_url_card.json b/pkg/scraper/test_responses/single_tweets/tweet_with_url_card.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_url_card.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_url_card.json diff --git a/scraper/test_responses/single_tweets/tweet_with_video.json b/pkg/scraper/test_responses/single_tweets/tweet_with_video.json similarity index 100% rename from scraper/test_responses/single_tweets/tweet_with_video.json rename to pkg/scraper/test_responses/single_tweets/tweet_with_video.json diff --git a/scraper/test_responses/suspended_user.json b/pkg/scraper/test_responses/suspended_user.json similarity index 100% rename from scraper/test_responses/suspended_user.json rename to pkg/scraper/test_responses/suspended_user.json diff --git a/scraper/test_responses/tombstones/tombstone_deleted.json b/pkg/scraper/test_responses/tombstones/tombstone_deleted.json similarity index 100% rename from scraper/test_responses/tombstones/tombstone_deleted.json rename to pkg/scraper/test_responses/tombstones/tombstone_deleted.json diff --git a/scraper/test_responses/tombstones/tombstone_hidden_1.json b/pkg/scraper/test_responses/tombstones/tombstone_hidden_1.json similarity index 100% rename from scraper/test_responses/tombstones/tombstone_hidden_1.json rename to pkg/scraper/test_responses/tombstones/tombstone_hidden_1.json diff --git a/scraper/test_responses/tombstones/tombstone_unavailable.json b/pkg/scraper/test_responses/tombstones/tombstone_unavailable.json similarity index 100% rename from scraper/test_responses/tombstones/tombstone_unavailable.json rename to pkg/scraper/test_responses/tombstones/tombstone_unavailable.json diff --git a/scraper/test_responses/tweet_content/image.json b/pkg/scraper/test_responses/tweet_content/image.json similarity index 100% rename from scraper/test_responses/tweet_content/image.json rename to pkg/scraper/test_responses/tweet_content/image.json diff --git a/scraper/test_responses/tweet_content/poll_card_2_options.json b/pkg/scraper/test_responses/tweet_content/poll_card_2_options.json similarity index 100% rename from scraper/test_responses/tweet_content/poll_card_2_options.json rename to pkg/scraper/test_responses/tweet_content/poll_card_2_options.json diff --git a/scraper/test_responses/tweet_content/poll_card_4_options_ended.json b/pkg/scraper/test_responses/tweet_content/poll_card_4_options_ended.json similarity index 100% rename from scraper/test_responses/tweet_content/poll_card_4_options_ended.json rename to pkg/scraper/test_responses/tweet_content/poll_card_4_options_ended.json diff --git a/scraper/test_responses/tweet_content/space.json b/pkg/scraper/test_responses/tweet_content/space.json similarity index 100% rename from scraper/test_responses/tweet_content/space.json rename to pkg/scraper/test_responses/tweet_content/space.json diff --git a/scraper/test_responses/tweet_content/space_object.json b/pkg/scraper/test_responses/tweet_content/space_object.json similarity index 100% rename from scraper/test_responses/tweet_content/space_object.json rename to pkg/scraper/test_responses/tweet_content/space_object.json diff --git a/scraper/test_responses/tweet_content/space_object_empty.json b/pkg/scraper/test_responses/tweet_content/space_object_empty.json similarity index 100% rename from scraper/test_responses/tweet_content/space_object_empty.json rename to pkg/scraper/test_responses/tweet_content/space_object_empty.json diff --git a/scraper/test_responses/tweet_content/url_card.json b/pkg/scraper/test_responses/tweet_content/url_card.json similarity index 100% rename from scraper/test_responses/tweet_content/url_card.json rename to pkg/scraper/test_responses/tweet_content/url_card.json diff --git a/scraper/test_responses/tweet_content/url_card_with_player.json b/pkg/scraper/test_responses/tweet_content/url_card_with_player.json similarity index 100% rename from scraper/test_responses/tweet_content/url_card_with_player.json rename to pkg/scraper/test_responses/tweet_content/url_card_with_player.json diff --git a/scraper/test_responses/tweet_content/url_card_with_player_placeholder_image.json b/pkg/scraper/test_responses/tweet_content/url_card_with_player_placeholder_image.json similarity index 100% rename from scraper/test_responses/tweet_content/url_card_with_player_placeholder_image.json rename to pkg/scraper/test_responses/tweet_content/url_card_with_player_placeholder_image.json diff --git a/scraper/test_responses/tweet_content/url_card_without_thumbnail.json b/pkg/scraper/test_responses/tweet_content/url_card_without_thumbnail.json similarity index 100% rename from scraper/test_responses/tweet_content/url_card_without_thumbnail.json rename to pkg/scraper/test_responses/tweet_content/url_card_without_thumbnail.json diff --git a/scraper/test_responses/tweet_content/video.json b/pkg/scraper/test_responses/tweet_content/video.json similarity index 100% rename from scraper/test_responses/tweet_content/video.json rename to pkg/scraper/test_responses/tweet_content/video.json diff --git a/scraper/test_responses/tweet_that_is_a_retweet.json b/pkg/scraper/test_responses/tweet_that_is_a_retweet.json similarity index 100% rename from scraper/test_responses/tweet_that_is_a_retweet.json rename to pkg/scraper/test_responses/tweet_that_is_a_retweet.json diff --git a/scraper/timestamp_type.go b/pkg/scraper/timestamp_type.go similarity index 100% rename from scraper/timestamp_type.go rename to pkg/scraper/timestamp_type.go diff --git a/scraper/tweet.go b/pkg/scraper/tweet.go similarity index 99% rename from scraper/tweet.go rename to pkg/scraper/tweet.go index 83e3acd..74cc7b8 100644 --- a/scraper/tweet.go +++ b/pkg/scraper/tweet.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "offline_twitter/terminal_utils" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/terminal_utils" ) var ERR_NO_TWEET = errors.New("Empty tweet") diff --git a/scraper/tweet_test.go b/pkg/scraper/tweet_test.go similarity index 99% rename from scraper/tweet_test.go rename to pkg/scraper/tweet_test.go index c3ff93a..503f9a5 100644 --- a/scraper/tweet_test.go +++ b/pkg/scraper/tweet_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func load_tweet_from_file(filename string) Tweet { diff --git a/scraper/tweet_trove.go b/pkg/scraper/tweet_trove.go similarity index 100% rename from scraper/tweet_trove.go rename to pkg/scraper/tweet_trove.go diff --git a/scraper/tweet_trove_test.go b/pkg/scraper/tweet_trove_test.go similarity index 96% rename from scraper/tweet_trove_test.go rename to pkg/scraper/tweet_trove_test.go index ea6e319..2e8bff9 100644 --- a/scraper/tweet_trove_test.go +++ b/pkg/scraper/tweet_trove_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestMergeTweetTroves(t *testing.T) { diff --git a/scraper/url.go b/pkg/scraper/url.go similarity index 100% rename from scraper/url.go rename to pkg/scraper/url.go diff --git a/scraper/url_test.go b/pkg/scraper/url_test.go similarity index 98% rename from scraper/url_test.go rename to pkg/scraper/url_test.go index f74d2af..1843081 100644 --- a/scraper/url_test.go +++ b/pkg/scraper/url_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseAPIUrlCard(t *testing.T) { diff --git a/scraper/user.go b/pkg/scraper/user.go similarity index 98% rename from scraper/user.go rename to pkg/scraper/user.go index 1526c5e..609b9b9 100644 --- a/scraper/user.go +++ b/pkg/scraper/user.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "offline_twitter/terminal_utils" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/terminal_utils" ) const DEFAULT_PROFILE_IMAGE_URL = "https://abs.twimg.com/sticky/default_profile_images/default_profile.png" diff --git a/scraper/user_feed.go b/pkg/scraper/user_feed.go similarity index 100% rename from scraper/user_feed.go rename to pkg/scraper/user_feed.go diff --git a/scraper/user_test.go b/pkg/scraper/user_test.go similarity index 98% rename from scraper/user_test.go rename to pkg/scraper/user_test.go index ff18f1b..34fb0cd 100644 --- a/scraper/user_test.go +++ b/pkg/scraper/user_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseSingleUser(t *testing.T) { diff --git a/scraper/video.go b/pkg/scraper/video.go similarity index 100% rename from scraper/video.go rename to pkg/scraper/video.go diff --git a/scraper/video_test.go b/pkg/scraper/video_test.go similarity index 94% rename from scraper/video_test.go rename to pkg/scraper/video_test.go index 856683d..1932ce5 100644 --- a/scraper/video_test.go +++ b/pkg/scraper/video_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "offline_twitter/scraper" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) func TestParseAPIVideo(t *testing.T) { diff --git a/terminal_utils/colors.go b/pkg/terminal_utils/colors.go similarity index 100% rename from terminal_utils/colors.go rename to pkg/terminal_utils/colors.go diff --git a/terminal_utils/formatting.go b/pkg/terminal_utils/formatting.go similarity index 100% rename from terminal_utils/formatting.go rename to pkg/terminal_utils/formatting.go diff --git a/terminal_utils/formatting_test.go b/pkg/terminal_utils/formatting_test.go similarity index 96% rename from terminal_utils/formatting_test.go rename to pkg/terminal_utils/formatting_test.go index 34141a1..dfdd7d1 100644 --- a/terminal_utils/formatting_test.go +++ b/pkg/terminal_utils/formatting_test.go @@ -5,7 +5,7 @@ import ( "reflect" - "offline_twitter/terminal_utils" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/terminal_utils" ) func TestWrapParagraph(t *testing.T) {