diff --git a/.gitignore b/.gitignore index 168aff366..592154704 100755 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,9 @@ *.db *.sql main -nyaa -nyaa.exe -nyaa-master.exe +mogupantsu +mogupantsu.exe +mogupantsu-master.exe *.zip *.swp .idea @@ -16,7 +16,7 @@ templates/*.html.go tags *.retry config/config.yml - +Godeps/_workspace # emacs temp files *\#* *~ diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 549cc421c..1cf2569b0 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/NyaaPantsu/nyaa", + "ImportPath": "github.com/HoloPirates/mogupantsu", "GoVersion": "go1.8", "GodepVersion": "v79", "Packages": [ diff --git a/README.md b/README.md index 5c05e338f..2d5c75e30 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ ![nyanpasu~](https://my.mixtape.moe/aglaxe.png) -# Nyaa replacement [![Build Status](https://travis-ci.org/NyaaPantsu/nyaa.svg?branch=master)](https://travis-ci.org/NyaaPantsu/nyaa) [![Go Report Card](https://goreportcard.com/badge/github.com/NyaaPantsu/nyaa)](https://goreportcard.com/report/github.com/NyaaPantsu/nyaa) [![GoDoc](https://godoc.org/github.com/NyaaPantsu/nyaa?status.svg)](https://godoc.org/github.com/NyaaPantsu/nyaa)[![Coverage Status](https://coveralls.io/repos/github/NyaaPantsu/nyaa/badge.svg?branch=dev)](https://coveralls.io/github/NyaaPantsu/nyaa?branch=dev) +# Nyaa replacement [![Build Status](https://travis-ci.org/NyaaPantsu/nyaa.svg?branch=master)](https://travis-ci.org/NyaaPantsu/nyaa) [![Go Report Card](https://goreportcard.com/badge/github.com/HoloPirates/mogupantsu)](https://goreportcard.com/report/github.com/HoloPirates/mogupantsu) [![GoDoc](https://godoc.org/github.com/HoloPirates/mogupantsu?status.svg)](https://godoc.org/github.com/HoloPirates/mogupantsu)[![Coverage Status](https://coveralls.io/repos/github/NyaaPantsu/nyaa/badge.svg?branch=dev)](https://coveralls.io/github/NyaaPantsu/nyaa?branch=dev) ## Motivation The aim of this project is to write a fully featured nyaa replacement in golang that anyone will be able to deploy locally or remotely. -## [Roadmap](https://github.com/NyaaPantsu/nyaa/projects/2) -As of August 17th the [trello board](https://trello.com/b/gMJBwoRq/nyaa-pantsu-cat-roadmap) has been moved to [GitHub Projects](https://github.com/NyaaPantsu/nyaa/projects/2) +## [Roadmap](https://github.com/HoloPirates/mogupantsu/projects/2) +As of August 17th the [trello board](https://trello.com/b/gMJBwoRq/nyaa-pantsu-cat-roadmap) has been moved to [GitHub Projects](https://github.com/HoloPirates/mogupantsu/projects/2) The Roadmap will give you an overview of the features and tasks that the project are currently discussing, working on and have completed. If you are looking for a feature that is not listed just make a GitHub Issue and it will get added to the trello board. -You can view the public GitHub Projects board [here](https://github.com/NyaaPantsu/nyaa/projects/2) or click on the "Roadmap". +You can view the public GitHub Projects board [here](https://github.com/HoloPirates/mogupantsu/projects/2) or click on the "Roadmap". # Requirements @@ -22,7 +22,7 @@ You can view the public GitHub Projects board [here](https://github.com/NyaaPant All tested versions of Ubuntu fail to build, use a different OS or docker * Install [Golang](https://golang.org/doc/install) (version >=1.8) * `go get -u github.com/tools/godep` -* `go get github.com/NyaaPantsu/nyaa` +* `go get github.com/HoloPirates/mogupantsu` On Windows, a specific version of GCC is used to build a specific depedency we use The GCC version packaged with [msys2](https://github.com/orlp/dev-on-windows/wiki/Installing-GCC--&-MSYS2) should work @@ -73,7 +73,7 @@ download [dos2unix](https://sourceforge.net/projects/dos2unix/files/latest/downl on the /deploy/init.sh to convert CR+LF to LF. ```sh -# Make sure the project is in here $GOPATH/src/github.com/NyaaPantsu/nyaa +# Make sure the project is in here $GOPATH/src/github.com/HoloPirates/mogupantsu $ cd deploy/ # You may choose another backend by pointing to the # appropriate docker-compose file. diff --git a/config/default_config.yml b/config/default_config.yml index abad4a718..80ed38e01 100644 --- a/config/default_config.yml +++ b/config/default_config.yml @@ -4,7 +4,7 @@ # Host of server host: localhost # Version of the app -version: "1.1.0" +version: "1.1.0-mogu" # port of server port: 9999 # database type @@ -24,15 +24,15 @@ comment_length: 2000 # the default config for web addresses web_address: # Nyaa : Origin of the website - nyaa: https://nyaa.pantsu.cat + nyaa: https://mogu.holopirates.moe # Sukebei : Origin of the sukebei website - sukebei: https://sukebei.pantsu.cat + sukebei: soon_maybe # Status : Origin of the status website - status: https://status.pantsu.cat + status: soon_maybe # the default config for session cookies cookies: # DomainName : The host domain so the cookies can be shared across subdomains - domain_name: pantsu.cat + domain_name: holopirates.moe # MaxAge : The expiration time of sessions cookies in seconds (default: 7 days) max_age: 604800 # HashKey : 64 byte key used to authenticate cookies using HMAC. Leave blank for a random key after each restart. @@ -45,7 +45,7 @@ scraper: workers: 4 interval: 3600 trackers: - - {url: "udp://tracker.coppersurfer.tk:6969/", name: coppersurfer.tk} + - {url: "udp://tracker.holopirates.moe:1337/announce", name: holopirates.moe} # StatScrapingFrequency : On-demand stat scraping JS will only be loaded if the stats have been scraped X hours ago or higher stat_scraping_frequency: 48 # StatScrapingFrequencyUnknown : On-demand stat scraping for unknown torrents JS will only be loaded if the stats have been scraped X hours ago or higher @@ -110,16 +110,27 @@ torrents: # TorrentStatus : Config of different status id for torrents status: [true, true, true, true, true, true] # TorrentSukebeiCategories : Config for Sukebei categories - sukebei_categories: {"1_": "art", "1_1": "art_anime", "1_2": "art_doujinshi", "1_3": "art_games", "1_4": "art_manga", "1_5": "art_pictures", "2_": "real_life", "2_1": "real_life_photobooks_and_pictures", "2_2": "real_life_videos"} + sukebei_categories: {} # TorrentCleanCategories : Config for Site categories - clean_categories: {"3_": "anime", "3_12": "anime_amv", "3_5": "anime_english_translated", "3_13": "anime_non_english_translated", "3_6": "anime_raw", "2_": "audio", "2_3": "audio_lossless", "2_4": "audio_lossy", "4_": "literature", "4_7": "literature_english_translated", "4_8": "literature_raw", "4_14": "literature_non_english_translated", "5_": "live_action", "5_9": "live_action_english_translated", "5_10": "live_action_idol_pv", "5_18": "live_action_non_english_translated", "5_11": "live_action_raw", "6_": "pictures", "6_15": "pictures_graphics", "6_16": "pictures_photos", "1_": "software", "1_1": "software_applications", "1_2": "software_games"} -# EnglishOnlyCategories : Which categories will only accept English torrents - english_only_categories: ["3_5", "4_7", "5_9"] + clean_categories: + { + "1_": "unarchived", + "1_1": "unarchived_karaoke", + "1_2": "unarchived_copyright", + "1_3": "unarchived_yab", + "2_": "paid", + "2_1": "paid_membership", + "2_2": "paid_voice_pack", + "2_3": "paid_concert", + "2_4": "paid_songs", + } + # EnglishOnlyCategories : Which categories will only accept English torrents + english_only_categories: [] # NonEnglishOnlyCategories : Which categories will only accept non-English torrents - non_english_only_categories: ["3_13", "4_14", "5_18"] + non_english_only_categories: [] # AdditionalLanguages : Which languages are available for selection when uploading a torrent, aside from # the ones we have translations. - additional_languages: ["es-mx"] + additional_languages: [] # TorrentFileStorage : Path to default torrent storage location (eg /var/www/wherever/you/want) torrents: # GenerationClientPort : Port used by the torrent client created during torrent generation @@ -133,7 +144,7 @@ torrents: trackers: # Trackers : Default trackers supported default: - - udp://tracker.uw0.xyz:6969/announce + - udp://tracker.holopirates.moe:1337/announce - udp://tracker.coppersurfer.tk:6969 - udp://tracker.zer0day.to:1337/announce - udp://tracker.leechers-paradise.org:6969 @@ -176,16 +187,18 @@ torrents: default: tags # Array of tag types allowed for now types: - - name: anidbid - field: AnidbID - defaults: - - db - - name: vndbid - field: VndbID - - name: dlsite - field: Dlsite - - name: vgmdbid - field: VgmdbID + # - name: anidbid + # field: AnidbID + # defaults: + # - db + # - name: vndbid + # field: VndbID + # - name: dlsite + # field: Dlsite + # - name: vgmdbid + # field: VgmdbID + - name: youtubeid + field: YoutubeID - name: videoquality field: VideoQuality defaults: @@ -221,7 +234,7 @@ log: error_log_max_age: 30 email: # SendEmail : Enable Email - send_email: true + send_email: false # EmailFrom : email address by default from: donotrespond@nyaa.pantsu.cat # EmailTestTo : when testing to who send email @@ -257,7 +270,7 @@ models: scrape_table_name: scrape #Default themes default_theme: - theme: g + theme: okayu dark: tomorrow forced: #Put a theme name in forced to force it for everyone diff --git a/controllers/README.md b/controllers/README.md index 169cabacf..cf8543422 100644 --- a/controllers/README.md +++ b/controllers/README.md @@ -3,15 +3,15 @@ Our routing system is based on [Gin-Gonic](https://github.com/gin-gonic/gin) HTT This readme will only explain to you how the routing works and how to easily render a static 'hello world!' template. ## How the routing works -1. Our routing system based on gin has one main file that connect all our controllers. This file is controllers/router.go [here](https://github.com/NyaaPantsu/nyaa/blob/dev/controllers/router.go). +1. Our routing system based on gin has one main file that connect all our controllers. This file is controllers/router.go [here](https://github.com/HoloPirates/mogupantsu/blob/dev/controllers/router.go). You can see that in the first lines, that this file import multiple sub directories. All the import that start with an underscore is a controller package. In fact, the main `router.go` only imports the different controllers and do nothing else. So if you need to create a whole new controller, you would have to **add it in this main `router.go` as an import that start with an underscore**. 2. Every controller package have another `router.go` file. It can be named differently but for homogenuity purposes, please name it like that. This file is the core of your controller package, you need it to add your controllers to the main router. All of the sub router.go files look pretty much the same. -For example, [here](https://github.com/NyaaPantsu/nyaa/blob/dev/controllers/search/router.go) is the `searchController` package `router.go` file. +For example, [here](https://github.com/HoloPirates/mogupantsu/blob/dev/controllers/search/router.go) is the `searchController` package `router.go` file. * This file first import the `controllers/router` package. This step is important in order to have access to the function `router.Get()`. * After it declares an `init()` function. This function is called automatically when the `searchController` package is imported. * In this function we call `router.Get().XXX()`. This part is where you link the different controllers to the routes. The XXX part are gin functions. In fact, `router.Get()` return a gin.Router so you can use all the functions from the gin.Router here. * Therefore `router.Get().Any("/", SearchHandler)` tells that every time you go to "/", it is the SearchHandler controller that should be called. -3. Every controller package have other go files. Those files should be where you put your controllers functions. Try to not put every controller functions in the same file. A controller function is the same as those designed by the Gin documentation. They should be function that accept as only argument: `c *gin.Context` and return nothing. For example, you can see [here](https://github.com/NyaaPantsu/nyaa/blob/dev/controllers/search/search.go#L19) the `SearchHandler` controller function. +3. Every controller package have other go files. Those files should be where you put your controllers functions. Try to not put every controller functions in the same file. A controller function is the same as those designed by the Gin documentation. They should be function that accept as only argument: `c *gin.Context` and return nothing. For example, you can see [here](https://github.com/HoloPirates/mogupantsu/blob/dev/controllers/search/search.go#L19) the `SearchHandler` controller function. ## Router Nyaa Functions Our routing system doesn't have much function that you can use besides the gin defined one. However we have one that you might find very helpful, it is `router.GetUser(c)`. This function declared in the `controllers/router` package returns the current `User` during the request. You can only use this function in a controller function which have access to the `c *gin.Context`. @@ -22,8 +22,8 @@ To use this templating system, it is quite easy. First you need to import the te For example, `templates.ModelList(c, "url/of/template/file.jet.html", ArrayOfModels, Navigation, SearchForm)` is a function displaying a template file with a local variable `Models` which is your `ArrayOfModels`. You also have `templates.Form(c, "url/of/template/file.jet.html", form)` which is a function displaying a template file with a `Form` local variable that is equal to the `form` variable passed. Furthermore you have `templates.Static(c, "url/of/template/file.jet.html")` which is a function displaying a static template file without any local variables -Finally, you can use a mix of `templates.CommonVariables` and `templates.Render(c, "url/of/template/file.jet.html", variables)` to render more specific templates which need special cases like [here](https://github.com/NyaaPantsu/nyaa/blob/dev/controllers/search/search.go#L70). -When you have rendered and you don't want to continue executing the function after the display of the template, you have to return. For example, [here](https://github.com/NyaaPantsu/nyaa/blob/dev/controllers/search/search.go#L70), we want to stop the function and render the template "errors/no_results.jet.html", so we return just after calling `templates.Render()`. +Finally, you can use a mix of `templates.CommonVariables` and `templates.Render(c, "url/of/template/file.jet.html", variables)` to render more specific templates which need special cases like [here](https://github.com/HoloPirates/mogupantsu/blob/dev/controllers/search/search.go#L70). +When you have rendered and you don't want to continue executing the function after the display of the template, you have to return. For example, [here](https://github.com/HoloPirates/mogupantsu/blob/dev/controllers/search/search.go#L70), we want to stop the function and render the template "errors/no_results.jet.html", so we return just after calling `templates.Render()`. ## Mini Tutorial: Hello World! To do this you will need a template file, a controller function and that's all! @@ -41,7 +41,7 @@ In `helloworld.go` we will place in it the controller function `HelloWorld(c *gi package helloWorldController import ( - "github.com/NyaaPantsu/nyaa/templates" // We import the templates package to use templates.* functions + "github.com/HoloPirates/mogupantsu/templates" // We import the templates package to use templates.* functions "github.com/gin-gonic/gin" // We import the gin package to use c *gin.Context ) @@ -57,7 +57,7 @@ In `router.go` we will link the controller function to the route we want to use ``` package helloWorldController -import "github.com/NyaaPantsu/nyaa/controllers/router" // We import the router package to get the gin.Router and add the route +import "github.com/HoloPirates/mogupantsu/controllers/router" // We import the router package to get the gin.Router and add the route // When the package is called, we do what's inside func init() { // we get the gin.Router an for Any method (Get/POST/PUT...) we associate /hello path url to the HelloWorld controller @@ -68,7 +68,7 @@ func init() { ### The link to the main `router.go` Now we need to tell to the Nyaa Programm that we have yet another controller package to add, for this you need to go to `controllers/router.go` and add the following line to the import section: ``` - _ "github.com/NyaaPantsu/nyaa/controllers/helloworld" // helloworld controller + _ "github.com/HoloPirates/mogupantsu/controllers/helloworld" // helloworld controller ``` ### The End diff --git a/controllers/activities/activities.go b/controllers/activities/activities.go index 56d75cff7..57048c459 100644 --- a/controllers/activities/activities.go +++ b/controllers/activities/activities.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/gin-gonic/gin" ) diff --git a/controllers/activities/router.go b/controllers/activities/router.go index ddc0c9c2d..7d7f4eb9f 100644 --- a/controllers/activities/router.go +++ b/controllers/activities/router.go @@ -1,6 +1,6 @@ package activitiesController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/activities", ActivityListHandler) diff --git a/controllers/api/api.go b/controllers/api/api.go index b4466b5ba..0a3e2a0b0 100644 --- a/controllers/api/api.go +++ b/controllers/api/api.go @@ -7,22 +7,22 @@ import ( "strings" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/feed" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/api" - "github.com/NyaaPantsu/nyaa/utils/cookies" - "github.com/NyaaPantsu/nyaa/utils/crypto" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/search" - "github.com/NyaaPantsu/nyaa/utils/upload" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/feed" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/api" + "github.com/HoloPirates/mogupantsu/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/crypto" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/search" + "github.com/HoloPirates/mogupantsu/utils/upload" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" "github.com/ory/fosite" "github.com/pkg/errors" diff --git a/controllers/api/router.go b/controllers/api/router.go index 4d4f85a2b..2e1c51c1f 100644 --- a/controllers/api/router.go +++ b/controllers/api/router.go @@ -1,8 +1,8 @@ package apiController import ( - "github.com/NyaaPantsu/nyaa/controllers/middlewares" - "github.com/NyaaPantsu/nyaa/controllers/router" + "github.com/HoloPirates/mogupantsu/controllers/middlewares" + "github.com/HoloPirates/mogupantsu/controllers/router" ) func init() { diff --git a/controllers/captcha/router.go b/controllers/captcha/router.go index 57698ab6b..6ae270043 100644 --- a/controllers/captcha/router.go +++ b/controllers/captcha/router.go @@ -1,8 +1,8 @@ package captchaController import ( - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/utils/captcha" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/utils/captcha" ) func init() { diff --git a/controllers/databasedumps/databasedumps.go b/controllers/databasedumps/databasedumps.go index 74fcc0007..0ac65558e 100644 --- a/controllers/databasedumps/databasedumps.go +++ b/controllers/databasedumps/databasedumps.go @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/metainfo" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/metainfo" "github.com/gin-gonic/gin" ) diff --git a/controllers/databasedumps/router.go b/controllers/databasedumps/router.go index 5156daefd..abf69fb61 100644 --- a/controllers/databasedumps/router.go +++ b/controllers/databasedumps/router.go @@ -1,6 +1,6 @@ package databasedumpsController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/dumps", DatabaseDumpHandler) diff --git a/controllers/faq/faq.go b/controllers/faq/faq.go index 3470a0267..250b236ba 100644 --- a/controllers/faq/faq.go +++ b/controllers/faq/faq.go @@ -1,7 +1,7 @@ package faqController import ( - "github.com/NyaaPantsu/nyaa/templates" + "github.com/HoloPirates/mogupantsu/templates" "github.com/gin-gonic/gin" ) diff --git a/controllers/faq/router.go b/controllers/faq/router.go index d7e79fda5..d955030a8 100644 --- a/controllers/faq/router.go +++ b/controllers/faq/router.go @@ -1,6 +1,6 @@ package faqController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/faq", FaqHandler) diff --git a/controllers/feed/eztv.go b/controllers/feed/eztv.go index e28167d61..79ae53c82 100644 --- a/controllers/feed/eztv.go +++ b/controllers/feed/eztv.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/feeds" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/feeds" "github.com/gin-gonic/gin" "github.com/gorilla/feeds" ) diff --git a/controllers/feed/helpers.go b/controllers/feed/helpers.go index 4fb788ddf..96c0184ca 100644 --- a/controllers/feed/helpers.go +++ b/controllers/feed/helpers.go @@ -6,12 +6,12 @@ import ( "strconv" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/feeds" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/feeds" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" ) diff --git a/controllers/feed/magnet.go b/controllers/feed/magnet.go index 4ef5fd857..6169560f0 100644 --- a/controllers/feed/magnet.go +++ b/controllers/feed/magnet.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/feeds" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/feeds" "github.com/gin-gonic/gin" "github.com/gorilla/feeds" diff --git a/controllers/feed/router.go b/controllers/feed/router.go index 6dede82e1..66d97792a 100644 --- a/controllers/feed/router.go +++ b/controllers/feed/router.go @@ -1,6 +1,6 @@ package feedController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/feed", RSSHandler) diff --git a/controllers/feed/rss.go b/controllers/feed/rss.go index b2b79e0f1..1709adfaa 100644 --- a/controllers/feed/rss.go +++ b/controllers/feed/rss.go @@ -7,8 +7,8 @@ import ( "time" "fmt" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/feeds" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/feeds" "github.com/gin-gonic/gin" "github.com/gorilla/feeds" diff --git a/controllers/feed/torznab.go b/controllers/feed/torznab.go index 3ec927ed3..fb08318d0 100644 --- a/controllers/feed/torznab.go +++ b/controllers/feed/torznab.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/categories" - "github.com/NyaaPantsu/nyaa/utils/feeds" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/feeds" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" "github.com/gin-gonic/gin" "github.com/gorilla/feeds" ) diff --git a/controllers/middlewares/middlewares.go b/controllers/middlewares/middlewares.go index 7fd597222..b3ee36ef1 100644 --- a/controllers/middlewares/middlewares.go +++ b/controllers/middlewares/middlewares.go @@ -3,12 +3,12 @@ package middlewares import ( "net/http" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/oauth2" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/oauth2" "github.com/gin-gonic/gin" "github.com/ory/fosite" ) diff --git a/controllers/middlewares/not_found_handler.go b/controllers/middlewares/not_found_handler.go index a1869bd39..cd0a99ffd 100644 --- a/controllers/middlewares/not_found_handler.go +++ b/controllers/middlewares/not_found_handler.go @@ -3,7 +3,7 @@ package middlewares import ( "net/http" - "github.com/NyaaPantsu/nyaa/templates" + "github.com/HoloPirates/mogupantsu/templates" "github.com/gin-gonic/gin" ) diff --git a/controllers/middlewares/router.go b/controllers/middlewares/router.go index 84fed7ba7..2c4ea2d2f 100644 --- a/controllers/middlewares/router.go +++ b/controllers/middlewares/router.go @@ -1,6 +1,6 @@ package middlewares -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Use(CSP(), ErrorMiddleware()) diff --git a/controllers/moderator/announcements.go b/controllers/moderator/announcements.go index d4b594e68..8101ca805 100644 --- a/controllers/moderator/announcements.go +++ b/controllers/moderator/announcements.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/notifications" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/announcement" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/notifications" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/announcement" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/api.go b/controllers/moderator/api.go index fb6b3ccfb..9d58b1fbb 100644 --- a/controllers/moderator/api.go +++ b/controllers/moderator/api.go @@ -3,7 +3,7 @@ package moderatorController import ( "net/http" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/comments.go b/controllers/moderator/comments.go index 38d02e733..929d9d26b 100644 --- a/controllers/moderator/comments.go +++ b/controllers/moderator/comments.go @@ -5,13 +5,13 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/comments" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/comments" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/deletedtorrents.go b/controllers/moderator/deletedtorrents.go index 626becbd8..26657553d 100644 --- a/controllers/moderator/deletedtorrents.go +++ b/controllers/moderator/deletedtorrents.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/helpers.go b/controllers/moderator/helpers.go index 97de3f3a7..35ee5ddef 100644 --- a/controllers/moderator/helpers.go +++ b/controllers/moderator/helpers.go @@ -4,16 +4,16 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/reports" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/categories" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/reports" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/categories" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/index.go b/controllers/moderator/index.go index 8542f313c..5066b6afd 100644 --- a/controllers/moderator/index.go +++ b/controllers/moderator/index.go @@ -1,12 +1,12 @@ package moderatorController import ( - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/comments" - "github.com/NyaaPantsu/nyaa/models/reports" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/templates" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/comments" + "github.com/HoloPirates/mogupantsu/models/reports" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/templates" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/oauth.go b/controllers/moderator/oauth.go index 1620a6e4e..03d3f4a53 100644 --- a/controllers/moderator/oauth.go +++ b/controllers/moderator/oauth.go @@ -9,17 +9,17 @@ import ( "fmt" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/oauth_client" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/format" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/oauth2/manager" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/api" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/oauth_client" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/format" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/oauth2/manager" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/api" "github.com/gin-gonic/gin" "github.com/ory/fosite" ) diff --git a/controllers/moderator/reassign.go b/controllers/moderator/reassign.go index 12aec3748..02c88ab10 100644 --- a/controllers/moderator/reassign.go +++ b/controllers/moderator/reassign.go @@ -1,11 +1,11 @@ package moderatorController import ( - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/templates" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/templates" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/reports.go b/controllers/moderator/reports.go index cee63d9d1..c54ca6c67 100644 --- a/controllers/moderator/reports.go +++ b/controllers/moderator/reports.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/reports" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/reports" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/router.go b/controllers/moderator/router.go index 612d30b4c..b97317641 100644 --- a/controllers/moderator/router.go +++ b/controllers/moderator/router.go @@ -1,8 +1,8 @@ package moderatorController import ( - "github.com/NyaaPantsu/nyaa/controllers/middlewares" - "github.com/NyaaPantsu/nyaa/controllers/router" + "github.com/HoloPirates/mogupantsu/controllers/middlewares" + "github.com/HoloPirates/mogupantsu/controllers/router" ) func init() { diff --git a/controllers/moderator/torrents.go b/controllers/moderator/torrents.go index e3d5cb101..9276bf78e 100644 --- a/controllers/moderator/torrents.go +++ b/controllers/moderator/torrents.go @@ -6,17 +6,17 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/reports" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/search" - "github.com/NyaaPantsu/nyaa/utils/upload" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/reports" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/search" + "github.com/HoloPirates/mogupantsu/utils/upload" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" "github.com/gin-gonic/gin" ) diff --git a/controllers/moderator/users.go b/controllers/moderator/users.go index 522400edd..c91953abd 100644 --- a/controllers/moderator/users.go +++ b/controllers/moderator/users.go @@ -5,9 +5,9 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/gin-gonic/gin" ) diff --git a/controllers/oauth/auth.go b/controllers/oauth/auth.go index e0bb2b20e..817afcd1c 100644 --- a/controllers/oauth/auth.go +++ b/controllers/oauth/auth.go @@ -3,14 +3,14 @@ package oauth import ( "net/http" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/cookies" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/oauth2" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/oauth2" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" "github.com/ory/fosite" ) diff --git a/controllers/oauth/callback.go b/controllers/oauth/callback.go index add864fe1..29c680f4c 100644 --- a/controllers/oauth/callback.go +++ b/controllers/oauth/callback.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + msg "github.com/HoloPirates/mogupantsu/utils/messages" - "github.com/NyaaPantsu/nyaa/templates" + "github.com/HoloPirates/mogupantsu/templates" "github.com/gin-gonic/gin" "github.com/ory/fosite" "github.com/parnurzeal/gorequest" diff --git a/controllers/oauth/introspection.go b/controllers/oauth/introspection.go index d89352ed5..a6f3f4dcb 100644 --- a/controllers/oauth/introspection.go +++ b/controllers/oauth/introspection.go @@ -1,8 +1,8 @@ package oauth import ( - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/oauth2" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/oauth2" "github.com/gin-gonic/gin" "github.com/ory/fosite" ) diff --git a/controllers/oauth/revoke.go b/controllers/oauth/revoke.go index dafd434b9..4123e9f69 100644 --- a/controllers/oauth/revoke.go +++ b/controllers/oauth/revoke.go @@ -1,7 +1,7 @@ package oauth import ( - "github.com/NyaaPantsu/nyaa/utils/oauth2" + "github.com/HoloPirates/mogupantsu/utils/oauth2" "github.com/gin-gonic/gin" "github.com/ory/fosite" ) diff --git a/controllers/oauth/router.go b/controllers/oauth/router.go index 622862f87..81a8c9847 100644 --- a/controllers/oauth/router.go +++ b/controllers/oauth/router.go @@ -1,6 +1,6 @@ package oauth -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { oauth2Routes := router.Get().Group("/oauth2") diff --git a/controllers/oauth/token.go b/controllers/oauth/token.go index 3667b6fee..70558750f 100644 --- a/controllers/oauth/token.go +++ b/controllers/oauth/token.go @@ -1,8 +1,8 @@ package oauth import ( - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/oauth2" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/oauth2" "github.com/gin-gonic/gin" "github.com/ory/fosite" ) diff --git a/controllers/pprof/router.go b/controllers/pprof/router.go index bc8534272..12e2132d3 100644 --- a/controllers/pprof/router.go +++ b/controllers/pprof/router.go @@ -1,7 +1,7 @@ package pprofController -import "github.com/NyaaPantsu/nyaa/controllers/router" -import "github.com/NyaaPantsu/nyaa/controllers/middlewares" +import "github.com/HoloPirates/mogupantsu/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/middlewares" func init() { // Adding pprof support diff --git a/controllers/report/report.go b/controllers/report/report.go index 648050c1f..e7dec8e2b 100644 --- a/controllers/report/report.go +++ b/controllers/report/report.go @@ -5,12 +5,12 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models/reports" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/captcha" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models/reports" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/captcha" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" ) diff --git a/controllers/report/router.go b/controllers/report/router.go index 275cc56a7..5cd1fe627 100644 --- a/controllers/report/router.go +++ b/controllers/report/router.go @@ -1,6 +1,6 @@ package reportController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { reportRoutes := router.Get().Group("/report") diff --git a/controllers/router.go b/controllers/router.go index d57fac144..0bf216427 100644 --- a/controllers/router.go +++ b/controllers/router.go @@ -3,25 +3,25 @@ package controllers import ( "net/http" - _ "github.com/NyaaPantsu/nyaa/controllers/activities" // activities controller - _ "github.com/NyaaPantsu/nyaa/controllers/api" // api controller - _ "github.com/NyaaPantsu/nyaa/controllers/captcha" // captcha controller - _ "github.com/NyaaPantsu/nyaa/controllers/databasedumps" // databasedumps controller - _ "github.com/NyaaPantsu/nyaa/controllers/faq" // faq controller - _ "github.com/NyaaPantsu/nyaa/controllers/feed" // feed controller - _ "github.com/NyaaPantsu/nyaa/controllers/middlewares" // middlewares - _ "github.com/NyaaPantsu/nyaa/controllers/moderator" // moderator controller - _ "github.com/NyaaPantsu/nyaa/controllers/oauth" // oauth2 controller - _ "github.com/NyaaPantsu/nyaa/controllers/pprof" // pprof controller - _ "github.com/NyaaPantsu/nyaa/controllers/report" // report controller - "github.com/NyaaPantsu/nyaa/controllers/router" - _ "github.com/NyaaPantsu/nyaa/controllers/search" // search controller - _ "github.com/NyaaPantsu/nyaa/controllers/settings" // settings controller - _ "github.com/NyaaPantsu/nyaa/controllers/static" // static files - _ "github.com/NyaaPantsu/nyaa/controllers/themeToggle" // themeToggle controller - _ "github.com/NyaaPantsu/nyaa/controllers/torrent" // torrent controller - _ "github.com/NyaaPantsu/nyaa/controllers/upload" // upload controller - _ "github.com/NyaaPantsu/nyaa/controllers/user" // user controller + _ "github.com/HoloPirates/mogupantsu/controllers/activities" // activities controller + _ "github.com/HoloPirates/mogupantsu/controllers/api" // api controller + _ "github.com/HoloPirates/mogupantsu/controllers/captcha" // captcha controller + _ "github.com/HoloPirates/mogupantsu/controllers/databasedumps" // databasedumps controller + _ "github.com/HoloPirates/mogupantsu/controllers/faq" // faq controller + _ "github.com/HoloPirates/mogupantsu/controllers/feed" // feed controller + _ "github.com/HoloPirates/mogupantsu/controllers/middlewares" // middlewares + _ "github.com/HoloPirates/mogupantsu/controllers/moderator" // moderator controller + _ "github.com/HoloPirates/mogupantsu/controllers/oauth" // oauth2 controller + _ "github.com/HoloPirates/mogupantsu/controllers/pprof" // pprof controller + _ "github.com/HoloPirates/mogupantsu/controllers/report" // report controller + "github.com/HoloPirates/mogupantsu/controllers/router" + _ "github.com/HoloPirates/mogupantsu/controllers/search" // search controller + _ "github.com/HoloPirates/mogupantsu/controllers/settings" // settings controller + _ "github.com/HoloPirates/mogupantsu/controllers/static" // static files + _ "github.com/HoloPirates/mogupantsu/controllers/themeToggle" // themeToggle controller + _ "github.com/HoloPirates/mogupantsu/controllers/torrent" // torrent controller + _ "github.com/HoloPirates/mogupantsu/controllers/upload" // upload controller + _ "github.com/HoloPirates/mogupantsu/controllers/user" // user controller "github.com/justinas/nosurf" ) diff --git a/controllers/router/helpers.go b/controllers/router/helpers.go index 42d8f29aa..567e670dc 100644 --- a/controllers/router/helpers.go +++ b/controllers/router/helpers.go @@ -1,8 +1,8 @@ package router import ( - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cookies" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cookies" "github.com/gin-gonic/gin" ) diff --git a/controllers/router/router.go b/controllers/router/router.go index 2f23aa5c4..339438765 100644 --- a/controllers/router/router.go +++ b/controllers/router/router.go @@ -3,7 +3,7 @@ package router import ( "sync" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/gin-gonic/gin" ) diff --git a/controllers/search/router.go b/controllers/search/router.go index 5427b0539..e76eaa3f8 100644 --- a/controllers/search/router.go +++ b/controllers/search/router.go @@ -1,6 +1,6 @@ package searchController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/", SearchHandler) diff --git a/controllers/search/search.go b/controllers/search/search.go index 8fa9c5061..a6fd5d506 100644 --- a/controllers/search/search.go +++ b/controllers/search/search.go @@ -9,11 +9,11 @@ import ( "math" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" "github.com/pkg/errors" ) diff --git a/controllers/settings/router.go b/controllers/settings/router.go index a097d2170..afc0271e2 100644 --- a/controllers/settings/router.go +++ b/controllers/settings/router.go @@ -1,6 +1,6 @@ package settingsController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().GET("/settings", SeePublicSettingsHandler) diff --git a/controllers/settings/settings.go b/controllers/settings/settings.go index 5fcd2b953..7a05af115 100644 --- a/controllers/settings/settings.go +++ b/controllers/settings/settings.go @@ -5,12 +5,12 @@ import ( "net/url" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/templates" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/timeHelper" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/templates" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/timeHelper" "github.com/gin-gonic/gin" ) diff --git a/controllers/static/router.go b/controllers/static/router.go index 854215273..eee8f4da8 100644 --- a/controllers/static/router.go +++ b/controllers/static/router.go @@ -3,8 +3,8 @@ package staticController import ( "net/http" - "github.com/NyaaPantsu/nyaa/controllers/databasedumps" - "github.com/NyaaPantsu/nyaa/controllers/router" + "github.com/HoloPirates/mogupantsu/controllers/databasedumps" + "github.com/HoloPirates/mogupantsu/controllers/router" ) func init() { diff --git a/controllers/themeToggle/router.go b/controllers/themeToggle/router.go index e511844d5..bcc3f03b4 100644 --- a/controllers/themeToggle/router.go +++ b/controllers/themeToggle/router.go @@ -1,6 +1,6 @@ package themeToggleController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/dark", toggleThemeHandler) diff --git a/controllers/themeToggle/themeToggle.go b/controllers/themeToggle/themeToggle.go index a744de0a5..a2b845fe9 100644 --- a/controllers/themeToggle/themeToggle.go +++ b/controllers/themeToggle/themeToggle.go @@ -3,11 +3,11 @@ package themeToggleController import ( "net/http" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/utils/timeHelper" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/utils/timeHelper" "github.com/gin-gonic/gin" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) diff --git a/controllers/torrent/comment.go b/controllers/torrent/comment.go index 5bf0b7041..104e851d7 100644 --- a/controllers/torrent/comment.go +++ b/controllers/torrent/comment.go @@ -5,14 +5,14 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models/comments" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/captcha" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/sanitize" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models/comments" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/captcha" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/sanitize" "github.com/gin-gonic/gin" ) diff --git a/controllers/torrent/delete.go b/controllers/torrent/delete.go index a45b52690..17dc0f338 100644 --- a/controllers/torrent/delete.go +++ b/controllers/torrent/delete.go @@ -4,12 +4,12 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/reports" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/reports" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" ) diff --git a/controllers/torrent/download.go b/controllers/torrent/download.go index 07cd476c4..7ea671022 100644 --- a/controllers/torrent/download.go +++ b/controllers/torrent/download.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/upload" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/upload" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/format" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/format" "github.com/gin-gonic/gin" ) diff --git a/controllers/torrent/edit.go b/controllers/torrent/edit.go index 2f282ec4d..a2b9926f0 100644 --- a/controllers/torrent/edit.go +++ b/controllers/torrent/edit.go @@ -5,13 +5,13 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/upload" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/upload" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" "github.com/gin-gonic/gin" ) diff --git a/controllers/torrent/router.go b/controllers/torrent/router.go index ce5c067be..3945c7a24 100644 --- a/controllers/torrent/router.go +++ b/controllers/torrent/router.go @@ -1,8 +1,8 @@ package torrentController import ( - "github.com/NyaaPantsu/nyaa/controllers/middlewares" - "github.com/NyaaPantsu/nyaa/controllers/router" + "github.com/HoloPirates/mogupantsu/controllers/middlewares" + "github.com/HoloPirates/mogupantsu/controllers/router" ) func init() { diff --git a/controllers/torrent/stats.go b/controllers/torrent/stats.go index f11dffa64..aae07a110 100644 --- a/controllers/torrent/stats.go +++ b/controllers/torrent/stats.go @@ -6,9 +6,9 @@ import ( "net/url" "time" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/config" "github.com/Stephen304/goscrape" "github.com/gin-gonic/gin" ) diff --git a/controllers/torrent/tag.go b/controllers/torrent/tag.go index 4e104be9c..a3ad4f19f 100644 --- a/controllers/torrent/tag.go +++ b/controllers/torrent/tag.go @@ -7,16 +7,16 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/tag" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/api" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/tag" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/tag" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/api" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/tag" "github.com/gin-gonic/gin" ) diff --git a/controllers/torrent/view.go b/controllers/torrent/view.go index 123a0b73a..43bd63ebe 100644 --- a/controllers/torrent/view.go +++ b/controllers/torrent/view.go @@ -4,13 +4,13 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models/notifications" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/captcha" - "github.com/NyaaPantsu/nyaa/utils/filelist" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models/notifications" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/captcha" + "github.com/HoloPirates/mogupantsu/utils/filelist" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" ) diff --git a/controllers/upload/router.go b/controllers/upload/router.go index 45849091f..5878377a4 100644 --- a/controllers/upload/router.go +++ b/controllers/upload/router.go @@ -1,6 +1,6 @@ package uploadController -import "github.com/NyaaPantsu/nyaa/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/router" func init() { router.Get().Any("/upload", UploadHandler) diff --git a/controllers/upload/upload.go b/controllers/upload/upload.go index fb6ba5d83..cc8f25e10 100644 --- a/controllers/upload/upload.go +++ b/controllers/upload/upload.go @@ -6,17 +6,17 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/cache" - "github.com/NyaaPantsu/nyaa/utils/captcha" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/upload" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/cache" + "github.com/HoloPirates/mogupantsu/utils/captcha" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/upload" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" "github.com/gin-gonic/gin" ) diff --git a/controllers/user/follow.go b/controllers/user/follow.go index ccd73add3..61441bfa8 100644 --- a/controllers/user/follow.go +++ b/controllers/user/follow.go @@ -4,8 +4,8 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models/users" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models/users" "github.com/gin-gonic/gin" ) diff --git a/controllers/user/login.go b/controllers/user/login.go index 22cf39e98..b34347ca6 100644 --- a/controllers/user/login.go +++ b/controllers/user/login.go @@ -3,11 +3,11 @@ package userController import ( "net/http" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/cookies" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/cookies" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" ) diff --git a/controllers/user/logout.go b/controllers/user/logout.go index d1c50fe1e..f7f1dda5d 100644 --- a/controllers/user/logout.go +++ b/controllers/user/logout.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/NyaaPantsu/nyaa/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/cookies" "github.com/gin-gonic/gin" ) diff --git a/controllers/user/profile.go b/controllers/user/profile.go index 9e9f157fb..e6e277318 100644 --- a/controllers/user/profile.go +++ b/controllers/user/profile.go @@ -8,19 +8,19 @@ import ( "net/http" - "github.com/NyaaPantsu/nyaa/controllers/router" - "github.com/NyaaPantsu/nyaa/models/notifications" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/cookies" - "github.com/NyaaPantsu/nyaa/utils/crypto" - "github.com/NyaaPantsu/nyaa/utils/email" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/controllers/router" + "github.com/HoloPirates/mogupantsu/models/notifications" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/crypto" + "github.com/HoloPirates/mogupantsu/utils/email" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" ) diff --git a/controllers/user/register.go b/controllers/user/register.go index 452a7abcc..9361450b0 100644 --- a/controllers/user/register.go +++ b/controllers/user/register.go @@ -3,14 +3,14 @@ package userController import ( "net/http" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/captcha" - "github.com/NyaaPantsu/nyaa/utils/cookies" - "github.com/NyaaPantsu/nyaa/utils/email" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/captcha" + "github.com/HoloPirates/mogupantsu/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/email" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" ) diff --git a/controllers/user/router.go b/controllers/user/router.go index 7bc9f4c4f..904b85583 100644 --- a/controllers/user/router.go +++ b/controllers/user/router.go @@ -1,8 +1,8 @@ package userController -import "github.com/NyaaPantsu/nyaa/controllers/router" -import "github.com/NyaaPantsu/nyaa/controllers/feed" -import "github.com/NyaaPantsu/nyaa/controllers/search" +import "github.com/HoloPirates/mogupantsu/controllers/router" +import "github.com/HoloPirates/mogupantsu/controllers/feed" +import "github.com/HoloPirates/mogupantsu/controllers/search" func init() { diff --git a/controllers/user/verify.go b/controllers/user/verify.go index 274bfb807..45f106666 100644 --- a/controllers/user/verify.go +++ b/controllers/user/verify.go @@ -1,9 +1,9 @@ package userController import ( - "github.com/NyaaPantsu/nyaa/templates" - "github.com/NyaaPantsu/nyaa/utils/email" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/templates" + "github.com/HoloPirates/mogupantsu/utils/email" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" ) diff --git a/go.mod b/go.mod index 15145f841..039a3d2f0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/NyaaPantsu/nyaa +module github.com/HoloPirates/mogupantsu go 1.12 diff --git a/main.go b/main.go index a92e7cb17..1b9115fc3 100644 --- a/main.go +++ b/main.go @@ -9,15 +9,15 @@ import ( "os" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/controllers" - "github.com/NyaaPantsu/nyaa/controllers/databasedumps" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cookies" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/search" - "github.com/NyaaPantsu/nyaa/utils/signals" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/controllers" + "github.com/HoloPirates/mogupantsu/controllers/databasedumps" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/search" + "github.com/HoloPirates/mogupantsu/utils/signals" ) var buildversion string diff --git a/models/activities/interaction.go b/models/activities/interaction.go index 65fe1b074..6ed241e49 100644 --- a/models/activities/interaction.go +++ b/models/activities/interaction.go @@ -1,7 +1,7 @@ package activities import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" ) // Log : log an activity from a user to his own id (System user id is 0) diff --git a/models/activity.go b/models/activity.go index b07a05158..08a4f0f53 100644 --- a/models/activity.go +++ b/models/activity.go @@ -4,7 +4,7 @@ import ( "html/template" "strings" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // Activity model diff --git a/models/comment.go b/models/comment.go index d21b2a81b..9a47ef6b8 100644 --- a/models/comment.go +++ b/models/comment.go @@ -4,7 +4,7 @@ import ( "html/template" "time" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // Comment model diff --git a/models/comments/create.go b/models/comments/create.go index e0289e65c..ba5836aad 100644 --- a/models/comments/create.go +++ b/models/comments/create.go @@ -3,8 +3,8 @@ package comments import ( "time" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cache" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cache" ) func Create(content string, torrent *models.Torrent, userID uint) (*models.Comment, error) { diff --git a/models/comments/helpers.go b/models/comments/helpers.go index 21e24bbb4..1105db039 100644 --- a/models/comments/helpers.go +++ b/models/comments/helpers.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/notifications" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/notifications" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) // When a new comment is added this is called diff --git a/models/comments/interaction.go b/models/comments/interaction.go index 1593e38bb..2901cd95e 100644 --- a/models/comments/interaction.go +++ b/models/comments/interaction.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" ) // FindAll : Find all comments based on conditions diff --git a/models/dumps.go b/models/dumps.go index c2eeac262..66f312cc7 100644 --- a/models/dumps.go +++ b/models/dumps.go @@ -4,7 +4,7 @@ import ( "html/template" "time" - "github.com/NyaaPantsu/nyaa/utils/format" + "github.com/HoloPirates/mogupantsu/utils/format" ) // DatabaseDump model diff --git a/models/file.go b/models/file.go index f1bd4d8c9..f85c7bd85 100644 --- a/models/file.go +++ b/models/file.go @@ -3,7 +3,7 @@ package models import ( "strings" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/zeebo/bencode" ) diff --git a/models/gorm.go b/models/gorm.go index eee6c2d09..5d2465817 100644 --- a/models/gorm.go +++ b/models/gorm.go @@ -1,8 +1,8 @@ package models import ( - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/postgres" // Need for postgres support _ "github.com/jinzhu/gorm/dialects/sqlite" // Need for sqlite diff --git a/models/gorm_test.go b/models/gorm_test.go index a73a2348f..aace3972f 100644 --- a/models/gorm_test.go +++ b/models/gorm_test.go @@ -5,7 +5,7 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/jinzhu/gorm" ) @@ -63,7 +63,7 @@ func TestGormInitSqlite(t *testing.T) { // - psql -c "CREATE USER nyaapantsu WITH PASSWORD 'nyaapantsu';" -U postgres // // Then enable the test by setting this variable to "true" via ldflags: -// go test ./... -v -ldflags="-X github.com/NyaaPantsu/nyaa/db.testPostgres=true" +// go test ./... -v -ldflags="-X github.com/HoloPirates/mogupantsu/db.testPostgres=true" var testPostgres = "false" func TestGormInitPostgres(t *testing.T) { diff --git a/models/notification.go b/models/notification.go index 1a0f3451a..89d8f0d13 100644 --- a/models/notification.go +++ b/models/notification.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // Notification model diff --git a/models/notifications/notifier.go b/models/notifications/notifier.go index 60fb03838..6a50aea78 100644 --- a/models/notifications/notifier.go +++ b/models/notifications/notifier.go @@ -1,7 +1,7 @@ package notifications import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" ) // NotifyUser : Notify a user with a notification according to his settings diff --git a/models/notifications/system.go b/models/notifications/system.go index df9ebb7b5..d1ac4b2da 100644 --- a/models/notifications/system.go +++ b/models/notifications/system.go @@ -4,9 +4,9 @@ import ( "errors" "time" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cache" - "github.com/NyaaPantsu/nyaa/utils/validator/announcement" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cache" + "github.com/HoloPirates/mogupantsu/utils/validator/announcement" ) const identifierAnnouncement = "system.announcement" diff --git a/models/oauth_client/create.go b/models/oauth_client/create.go index 1aa19dc07..7d754240a 100644 --- a/models/oauth_client/create.go +++ b/models/oauth_client/create.go @@ -3,9 +3,9 @@ package oauth_client import ( "strings" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/sanitize" - "github.com/NyaaPantsu/nyaa/utils/validator/api" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/sanitize" + "github.com/HoloPirates/mogupantsu/utils/validator/api" ) func Create(form *apiValidator.CreateForm) (*models.OauthClient, error) { diff --git a/models/oauth_client/delete.go b/models/oauth_client/delete.go index 116a9e041..2c96829f7 100644 --- a/models/oauth_client/delete.go +++ b/models/oauth_client/delete.go @@ -1,7 +1,7 @@ package oauth_client import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "github.com/pkg/errors" ) diff --git a/models/oauth_client/find.go b/models/oauth_client/find.go index 665d97966..bd640a99b 100644 --- a/models/oauth_client/find.go +++ b/models/oauth_client/find.go @@ -1,7 +1,7 @@ package oauth_client import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "github.com/pkg/errors" ) diff --git a/models/oauth_server.go b/models/oauth_server.go index dc668f7d2..429511b54 100644 --- a/models/oauth_server.go +++ b/models/oauth_server.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/oauth2/client" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/oauth2/client" "github.com/ory/fosite" "github.com/pkg/errors" ) diff --git a/models/oauth_server/delete.go b/models/oauth_server/delete.go index 958c5ed4a..b5a157636 100644 --- a/models/oauth_server/delete.go +++ b/models/oauth_server/delete.go @@ -1,7 +1,7 @@ package oauth_server import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "github.com/ory/fosite" "github.com/pkg/errors" ) diff --git a/models/oauth_server/find.go b/models/oauth_server/find.go index 8aa80b778..187ee4040 100644 --- a/models/oauth_server/find.go +++ b/models/oauth_server/find.go @@ -1,7 +1,7 @@ package oauth_server import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "github.com/ory/fosite" "github.com/pkg/errors" ) diff --git a/models/report.go b/models/report.go index f38f23449..24e66d50b 100644 --- a/models/report.go +++ b/models/report.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // TorrentReport model diff --git a/models/reports/create.go b/models/reports/create.go index 2c0943902..7c001bf51 100644 --- a/models/reports/create.go +++ b/models/reports/create.go @@ -3,7 +3,7 @@ package reports import ( "time" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "errors" ) diff --git a/models/reports/interaction.go b/models/reports/interaction.go index e35bedd92..d7ebcd625 100644 --- a/models/reports/interaction.go +++ b/models/reports/interaction.go @@ -8,7 +8,7 @@ import ( elastic "gopkg.in/olivere/elastic.v5" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" ) // Query : Interface to pass for torrents query diff --git a/models/scrape.go b/models/scrape.go index 6faef7f35..9e170118f 100644 --- a/models/scrape.go +++ b/models/scrape.go @@ -6,9 +6,9 @@ import ( "time" "fmt" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/cache" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/cache" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/fatih/structs" ) diff --git a/models/tag.go b/models/tag.go index 43f19d902..57e837bcb 100644 --- a/models/tag.go +++ b/models/tag.go @@ -5,8 +5,8 @@ import ( "errors" "net/http" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/fatih/structs" ) diff --git a/models/tag/create.go b/models/tag/create.go index 66ed67a75..31f4b4db4 100644 --- a/models/tag/create.go +++ b/models/tag/create.go @@ -1,8 +1,8 @@ package tags import ( - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cache" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cache" "github.com/pkg/errors" ) diff --git a/models/tag/delete.go b/models/tag/delete.go index 71175d22a..6802900ff 100644 --- a/models/tag/delete.go +++ b/models/tag/delete.go @@ -1,7 +1,7 @@ package tags import ( - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "github.com/pkg/errors" ) diff --git a/models/tag/find.go b/models/tag/find.go index 802b7df66..09d04e4b5 100644 --- a/models/tag/find.go +++ b/models/tag/find.go @@ -1,6 +1,6 @@ package tags -import "github.com/NyaaPantsu/nyaa/models" +import "github.com/HoloPirates/mogupantsu/models" func FindAll(tagType string, torrentID uint) ([]models.Tag, error) { tags := []models.Tag{} diff --git a/models/tag/helpers.go b/models/tag/helpers.go index 4aa5780e2..8826bef65 100644 --- a/models/tag/helpers.go +++ b/models/tag/helpers.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/log" ) // FilterOrCreate check if a tag type has reached the maximal votes and removes the other tag of the same type diff --git a/models/tag_test.go b/models/tag_test.go index a0f0dc5f1..c862c4070 100644 --- a/models/tag_test.go +++ b/models/tag_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/stretchr/testify/assert" ) diff --git a/models/torrent.go b/models/torrent.go index 890f10c2c..1ae513a0e 100644 --- a/models/torrent.go +++ b/models/torrent.go @@ -17,11 +17,11 @@ import ( "net/http" "net/url" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/cache" - "github.com/NyaaPantsu/nyaa/utils/format" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/sanitize" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/cache" + "github.com/HoloPirates/mogupantsu/utils/format" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/sanitize" "github.com/bradfitz/slice" "github.com/fatih/structs" ) diff --git a/models/torrents/create.go b/models/torrents/create.go index e73e2faa5..853217e07 100644 --- a/models/torrents/create.go +++ b/models/torrents/create.go @@ -3,12 +3,12 @@ package torrents import ( "time" - "github.com/NyaaPantsu/nyaa/models/tag" + "github.com/HoloPirates/mogupantsu/models/tag" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" ) // Create a new torrent based on the uploadform request struct diff --git a/models/torrents/find.go b/models/torrents/find.go index 7f091ed58..a9669f2fb 100644 --- a/models/torrents/find.go +++ b/models/torrents/find.go @@ -10,9 +10,9 @@ import ( "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cache" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cache" ) // Query : Interface to pass for torrents query diff --git a/models/torrents/helpers.go b/models/torrents/helpers.go index 8285dc185..6986d42d8 100644 --- a/models/torrents/helpers.go +++ b/models/torrents/helpers.go @@ -7,11 +7,11 @@ import ( "html/template" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/activities" - "github.com/NyaaPantsu/nyaa/models/notifications" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/activities" + "github.com/HoloPirates/mogupantsu/models/notifications" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) // ExistOrDelete : Check if a torrent exist with the same hash and if it can be replaced, it is replaced diff --git a/models/user.go b/models/user.go index f26de4b67..f15b9038a 100644 --- a/models/user.go +++ b/models/user.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/fatih/structs" "net/http" @@ -14,8 +14,8 @@ import ( "math" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/crypto" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/crypto" ) const ( diff --git a/models/users/create.go b/models/users/create.go index 21791853e..3564cfa53 100644 --- a/models/users/create.go +++ b/models/users/create.go @@ -5,12 +5,12 @@ import ( "net/http" "time" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/crypto" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/crypto" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" "golang.org/x/crypto/bcrypt" ) diff --git a/models/users/find.go b/models/users/find.go index e1c5f35d0..a179b959a 100644 --- a/models/users/find.go +++ b/models/users/find.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/jinzhu/gorm" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/log" ) // FindOrCreateUser creates a user. diff --git a/models/users/helpers.go b/models/users/helpers.go index 321467eaa..cb052f981 100644 --- a/models/users/helpers.go +++ b/models/users/helpers.go @@ -5,9 +5,9 @@ import ( "net/http" "strconv" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "golang.org/x/crypto/bcrypt" ) diff --git a/models/users/request.go b/models/users/request.go index 80b623628..7cef55516 100644 --- a/models/users/request.go +++ b/models/users/request.go @@ -4,11 +4,11 @@ import ( "errors" "net/http" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/utils/log" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/validator" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" "golang.org/x/crypto/bcrypt" ) diff --git a/network.go b/network.go index 0fe26b6a8..fe6dc6201 100644 --- a/network.go +++ b/network.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/majestrate/i2p-tools/lib/i2p" ) diff --git a/network_test.go b/network_test.go index fb93d4920..adace9dd3 100644 --- a/network_test.go +++ b/network_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "sync" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) type MyHandler struct { diff --git a/public/css/themes/mogu.css b/public/css/themes/mogu.css new file mode 100644 index 000000000..164f40751 --- /dev/null +++ b/public/css/themes/mogu.css @@ -0,0 +1,368 @@ +body { + color: #c5c8c6; + background: #1d1f21; +} + +.header, .box, .pagination span, .user-menu { + box-shadow: 1px 3px 4px rgba(0, 0, 0, 0.2) +} + +#mascot { + background-image: url('/img/okayu.svg'); +} + +a { + color: #81a2be; +} + +a:hover { + color: #5F89AC; +} + +.header { + background: #282A2E; + border-color: #000; +} + +.header .nav-btn { + color: #c5c8c6; +} + +.header .nav-btn:hover { + color: #eee; +} + +#cookie-warning { + background: hsla(0, 0%, 21%, 0.9); + border-top: 1px solid #4e4e4e; + color: #9a9a9a; +} +#cookie-warning .close { + color: #9a9a9a; +} + +.box, .pagination span, .modtools { + background: hsla(222, 8%, 20%, 0.85); + border-color: #141517 !important; +} + +.form-input { + border-color: #0C0D0E !important; + background: #141517; + color: #c5c8c6; +} +.form-input.refine { + border-color: #323232!important; + background: #424242; + color: #bbbbbb; +} +.header .h-user .user-avatar { + background: #99BFD0; + border-color: #282A2E; +} +.user-avatar span { + background-color: #d02727; + color: #272727; +} + +.header .h-user .user-menu { + background: #282A2E; + background: -moz-linear-gradient(top, #282A2E 0%, #34373C 100%); + background: -webkit-linear-gradient(top, #282A2E 0%, #34373C 100%); + background: linear-gradient(to bottom, #282A2E 0%, #34373C 100%); + border-color: #282A2E; +} + +table thead { + background: #141517 !important; +} + +th { + color: #838B98; +} + +th a { + color: #c5c8c6; +} + +th, td { + border-color: #141517 !important; +} + +td.tr-se, .success-text { + color: #b5bd68; +} + +td.tr-le, .error-text { + color: #cc6666; +} + +.btn-red { + background-color: #cc6666; +} +.sukebei .btn-red { + color: #c5c8c6; +} +.btn-grey { + background-color: #777777; +} + +.alt-colors tr:nth-child(even) { + background: hsla(244, 11%, 21%, 0.2); +} +.alt-colors tr:nth-child(odd) { + background: hsla(255, 31%, 6%, 0.2); +} +.aplus, .btn-blue { + background: hsla(180, 50%, 50%, 0.2) !important; +} + +.trusted, .btn-green { + background: hsla(90, 50%, 50%, 0.2) !important; +} + +.remake, .btn-orange { + background: hsla(40, 50%, 50%, 0.2) !important; +} + +a.form-input[class*="btn"]:hover { + color: #dedede; +} + +.pagination .active { + background: #141517; + color: #c5c8c6; +} +.sukebei .pagination .active { + color: #ff5252; +} + +.pagination .disabled { + color: #141517; + cursor: unset; +} + +.sukebei { + color: #c5c8c6; +} + +.sukebei a { + color: #cc6666; +} + +.sukebei a:hover { + color: #c82829; +} + +.sukebei th, .sukebei th a { + color: #c5c8c6; +} + +.captcha-container img { + background: #fff; + border-radius: .4em .4em 0 0; + border-bottom: .5em solid #fff; + margin-bottom: -.5em; +} + + +/* Markdown editor */ + +.editor-toolbar a { + color: #fff !important; +} + +.editor-toolbar a.active, .editor-toolbar a:hover { + background: #666; + border-color: #828282; +} + +.editor-toolbar { + background: #000 !important; +} + +.editor-toolbar.fullscreen::before, .editor-toolbar.fullscreen::after { + display: none; +} + +.editor-preview, .editor-preview-side, .editor-toolbar.disabled-for-preview a:not(.no-disable) { + background: #141517; +} + +.CodeMirror { + color: #fff; + background: #141517; +} + +.CodeMirror-cursor { + border-color: #fff; +} + +.CodeMirror .CodeMirror-selected { + background: #585858; +} + +.CodeMirror-focused .CodeMirror-selected, .CodeMirror-line::selection, .CodeMirror-line>span::selection, .CodeMirror-line>span>span::selection { + background: #454545; +} + +.CodeMirror-line::-moz-selection, .CodeMirror-line>span::-moz-selection, .CodeMirror-line>span>span::-moz-selection { + background: #454545; +} + +.form-input.language { + background-color: #35363c; +} + +.torrent-info-box>p>a, .torrent-info-box>div>a, #description-box a { + text-decoration: none; +} + +.modal-content { + background: hsla(222, 8%, 20%, 1); + border-color: #5a5a5a; +} +.modal-header { + background: #8149bf; +} +.modal-footer { + background: #1d1c1f; +} +.modal-footer span button { + border-color: black; +} +.modal-footer span #confirm_changes { + background: #5c966a; +} +.modal-footer span .close { + background: #cc4f4f; +} + +.announce { + color: #3a4249; + background-color: #F4E0C9; + border-color: #ae875b; +} + +#admin-header { + background: hsla(222, 5%, 16%, 0.85); + border-color: #141517; +} +#admin-header .nav-btn { + border-color: #141517; + color: #a2a7a4; +} +#admin-header .nav-btn.active, #admin-header .nav-btn:hover, #admin-header:hover .nav-btn.active:hover, #admin-header .nav-btn:focus { + background-color: #2c2f34; + color: #c5c8c6; +} + +.torrent-preview-table>table { + border-color: #141115; +} + +.torrent-info-box { + border-color: #515456; +} +.tr-cat div.nyaa-cat { border-color: #232324!important; } +.torrent-preview-table > table { border: 2px solid #1a1a1d; } + +.tag.pending { + background: #3c3c3c; + color: #c1c1c1; + border: 1px solid black; +} +.tag.pending a.tag-form { + color: white; + border-left: none; +} +.tag.pending a.tag-form.plus { + background-color: #3f7137; +} +.tag.pending a.tag-form.minus { + background-color: #9e3131; + font-weight: bold; +} +span.tag { + box-shadow: none; +} +.tag.accepted { + border: 1px solid #000000; + background: #272523; +} +.tag.accepted .tag-text a { + color: #7a8494; +} + +.upload-status { + background-color: #1f2329; + border-color:#1f2329; + color: white; +} +.upload-status .upload-site-name { + border-right-color: black!important; + background: none!important; +} +.upload-status .icon-finished { + border-right-color: #9ea749!important +} +.upload-status .icon-pending { + border-right-color: #906718!important; +} +.upload-status .icon-error { + border-right-color: #b34d4d!important; +} + +.upload-status .upload-progress { + background-color: #717171; +} +.multiple-upload input { + border-color: #7c8084; + color: #b3b3b3; +} + +.multiple-upload .finished { + background-color: #b5bd68; +} +.multiple-upload .pending { + background-color: #b1893b; + +} +.multiple-upload .error { + background-color: #cc6666; +} + +.upload-form-table .checkbox-container { + border-color: #0c0d0e; + background: #28282b; +} + +#anidex-upload-info > div input[type="text"], #anidex-upload-info > div select { + background-color: #28282b; +} + +.torrent-info-row .tr-se span, .torrent-info-row .tr-le span, .torrent-info-row .tr-dl span { + background-color: #544433; +} + +.admin-content tr:hover { + background: #201f23; +} +.admin-content tr:hover a { + color: #bbd2e6; +} +.sukebei .admin-content tr:hover a { + color: #ea8c8c; +} + +#subscribe-link::before, #subscribe-link::after { + color: #c5c8c6!important; +} + +td.notification-status { + background-color: #505255; +} +td.notification-status.notification-unread { + background-color: rgba(144, 103, 24, 0.4); + color: #c5c8c6; +} diff --git a/public/img/favicon.png b/public/img/favicon.png index d45169de9..d53f8e674 100644 Binary files a/public/img/favicon.png and b/public/img/favicon.png differ diff --git a/public/img/okayu.svg b/public/img/okayu.svg new file mode 100644 index 000000000..6f6032e49 --- /dev/null +++ b/public/img/okayu.svg @@ -0,0 +1,2283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/js/languages.js b/public/js/languages.js index 82cfe610e..b605862ef 100644 --- a/public/js/languages.js +++ b/public/js/languages.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat function loadLanguages() { var xhr = new XMLHttpRequest(); diff --git a/public/js/main.js b/public/js/main.js index 4971a960a..164553fc3 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat //String that will contain a far future date, used multiple times throughout multiple functions diff --git a/public/js/modal.js b/public/js/modal.js index dd59a85aa..afc804950 100644 --- a/public/js/modal.js +++ b/public/js/modal.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat // Get the modal var Modal = { diff --git a/public/js/query.js b/public/js/query.js index ccdd736e1..b78e9ca75 100644 --- a/public/js/query.js +++ b/public/js/query.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat var Query = { Failed: 0, diff --git a/public/js/selectAll.js b/public/js/selectAll.js index cda8fc83f..69b01592f 100644 --- a/public/js/selectAll.js +++ b/public/js/selectAll.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat document.querySelector("[data-selectall='checkbox']").addEventListener("change", function (e) { var cbs = document.querySelectorAll("input[type='checkbox'].selectable"); diff --git a/public/js/template.js b/public/js/template.js index 65b3104f5..42da85935 100644 --- a/public/js/template.js +++ b/public/js/template.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat // Templates variable var Templates = { diff --git a/public/js/torrents.js b/public/js/torrents.js index f33cf27bd..8cc892731 100644 --- a/public/js/torrents.js +++ b/public/js/torrents.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat var Torrents = { CanRefresh: false, diff --git a/public/js/torrentsMod.js b/public/js/torrentsMod.js index 482e0b2f0..022db630d 100644 --- a/public/js/torrentsMod.js +++ b/public/js/torrentsMod.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat var TorrentsMod = { // Variables that can be modified to change the dom interactions diff --git a/public/js/translation.js b/public/js/translation.js index dd97d87fc..4bacdddcb 100644 --- a/public/js/translation.js +++ b/public/js/translation.js @@ -1,4 +1,4 @@ -// @source https://github.com/NyaaPantsu/nyaa/tree/dev/public/js +// @source https://github.com/HoloPirates/mogupantsu/tree/dev/public/js // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat function Translations() { var translations = {} diff --git a/templates/README.md b/templates/README.md index d8ad36687..bc6c96ba6 100644 --- a/templates/README.md +++ b/templates/README.md @@ -6,7 +6,7 @@ For all syntaxic question, it is recommanded to look into Jet Template documenta You can, pretty much, name your files however you want. But, to keep some homogenuity, it would be preferable to keep the name in lowercase, you can use underscores and you have to use the suffix ".jet.html" ## Global Variables -In every template file, besides the built-in functions from Jet Template, you have also some Nyaa Global Variables that you can access to. Those variables are set in `template.go` in CommonVariable function. If you want to add a global variable, it is [there](https://github.com/NyaaPantsu/nyaa/blob/dev/templates/template.go#L58). Be aware to set only important variables here, not page specific one. +In every template file, besides the built-in functions from Jet Template, you have also some Nyaa Global Variables that you can access to. Those variables are set in `template.go` in CommonVariable function. If you want to add a global variable, it is [there](https://github.com/HoloPirates/mogupantsu/blob/dev/templates/template.go#L58). Be aware to set only important variables here, not page specific one. ### What do they do? Here we will try to look into each variable and explain how do they work. * `Config` variable is the website configuration set in config/config.yml. You can access every exported Properties and functions from `config/struct.go`. For example, Config.Torrents.Tags.Default return the default tag type and Config.Port return the running port. @@ -24,7 +24,7 @@ Here we will try to look into each variable and explain how do they work. Pretty simple, just type: `{{ NameOfVariable }}`. For example, {{ URL.String() }} to get the current URL. ## Global Functions -Same as global variables, there are also global functions. They are all defined [here](https://github.com/NyaaPantsu/nyaa/blob/dev/templates/template_functions.go#L24). +Same as global variables, there are also global functions. They are all defined [here](https://github.com/HoloPirates/mogupantsu/blob/dev/templates/template_functions.go#L24). * `contains(language, string)` tells you if a language corresponds to the language code provided * `genActivityContent(activity, T function)` returns the translated activty. * `genUploaderLink(uploaderID, uploaderName, hidden)` return a `Username` for the user provided based on the elements provided. For example, if you provide a username and no userID or a hidden bool to true. Then it won't return a link but will return "renchon" username. diff --git a/templates/helpers.go b/templates/helpers.go index 159d25f15..13cfd14e4 100644 --- a/templates/helpers.go +++ b/templates/helpers.go @@ -1,8 +1,8 @@ package templates import ( - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" ) diff --git a/templates/layouts/partials/base.jet.html b/templates/layouts/partials/base.jet.html index fc5ba9813..1434c19d1 100644 --- a/templates/layouts/partials/base.jet.html +++ b/templates/layouts/partials/base.jet.html @@ -50,7 +50,7 @@
{{ yield infos()}} {{ yield errors()}} - {{ if !isset(Infos["system"])}}
{{ yield ad_wide(Type=AdType) }}
{{end}} + {{ block content_body_base() }}{{end}}
{{ block mascot() }} @@ -86,13 +86,13 @@ {{end}} {{ if !EUCookieLaw }}{{ end }} -
{{ yield ad_wide(Type=AdType) }}
+ diff --git a/templates/layouts/partials/helpers/rules.jet.html b/templates/layouts/partials/helpers/rules.jet.html index 28645768d..832d19a57 100644 --- a/templates/layouts/partials/helpers/rules.jet.html +++ b/templates/layouts/partials/helpers/rules.jet.html @@ -4,9 +4,10 @@
diff --git a/templates/site/static/faq.jet.html b/templates/site/static/faq.jet.html index 20a7ce508..09bb50e3e 100644 --- a/templates/site/static/faq.jet.html +++ b/templates/site/static/faq.jet.html @@ -13,13 +13,13 @@

{{ T("faq")}}

Nyaa - {{GetHostname(Config.WebAddress.Nyaa)}}
- Sukebei - {{GetHostname(Config.WebAddress.Sukebei)}}

+

{{ T("torrent_colors")}}

{{ T("green")}}

@@ -33,7 +33,7 @@

{{ T("torrent_colors")}}

  • {{ T("reupload")}}
  • -

    {{ T("how_do_i_link_my_old_account")}}

    +

    {{ T("api_help")}}

    {{ T("api_documentation")}}

    RSS Feed Information

    - Feed Routes + Feed Routes

    Base URL: {{if Sukebei()}}{{GetHostname(Config.WebAddress.Sukebei)}}{{else}}{{GetHostname(Config.WebAddress.Nyaa)}}{{end}}/feed/(Feed Type)/p/(Page Number) "/p/(Page Number)" is optional

    EX: {{if Sukebei()}}{{GetHostname(Config.WebAddress.Sukebei)}}{{else}}{{GetHostname(Config.WebAddress.Nyaa)}}{{end}}/feed/magnet/p/2?c=1_1&userID=0&limit=100 (Limit max is 300 items per page)

    @@ -71,12 +71,12 @@

    {{ T("how_do_i_download_the_torrents")}}

    {{ T("magnet_link_should_look_like")}} magnet:?xt=urn:btih:[hash]&dn=[name]&tr=[tracker]&tr=[...]

    -

    {{ T("faq_ads")}}

    -

    {{ T("faq_ads_explanation")|raw}}

    +

    {{ T("which_trackers_do_you_recommend")}}

    {{ T("answer_which_trackers_do_you_recommend")}}

    -
    udp://tracker.uw0.xyz:6969
    +    
    udp://tracker.holopirates.moe:1337/announce
     udp://tracker.zer0day.to:1337/announce
     udp://tracker.leechers-paradise.org:6969
     udp://explodie.org:6969
    @@ -89,17 +89,17 @@ 

    {{ T("how_can_i_help")}}

    {{ T("answer_how_can_i_help")|raw}}

    {{ T("your_design_sucks_found_a_bug")}}

    -

    https://github.com/NyaaPantsu/nyaa/issues.

    +

    https://github.com/HoloPirates/mogupantsu/issues.

    {{ T("why_written_in_go")}}

    {{ T("authors_favorite_language")}}

    -

    {{ T("who_is_renchon")|raw}}

    + {{end}} diff --git a/templates/template.go b/templates/template.go index 71ddc906c..1ece1eb14 100644 --- a/templates/template.go +++ b/templates/template.go @@ -5,20 +5,20 @@ import ( "path" "strconv" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/filelist" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/search" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/filelist" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/search" "github.com/gin-gonic/gin" "github.com/justinas/nosurf" "fmt" "github.com/CloudyKit/jet" - "github.com/NyaaPantsu/nyaa/utils/cookies" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/utils/cookies" + "github.com/HoloPirates/mogupantsu/utils/validator/user" ) // TemplateDir : Variable to the template directory diff --git a/templates/template_functions.go b/templates/template_functions.go index 607f923d5..38390e32a 100644 --- a/templates/template_functions.go +++ b/templates/template_functions.go @@ -14,14 +14,14 @@ import ( "strings" "github.com/CloudyKit/jet" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/utils/categories" - "github.com/NyaaPantsu/nyaa/utils/filelist" - "github.com/NyaaPantsu/nyaa/utils/format" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/torrentLanguages" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/filelist" + "github.com/HoloPirates/mogupantsu/utils/format" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/torrentLanguages" ) // FuncMap : Functions accessible in templates by {{ $.Function }} diff --git a/templates/template_functions_test.go b/templates/template_functions_test.go index de18a0098..6482e3d74 100644 --- a/templates/template_functions_test.go +++ b/templates/template_functions_test.go @@ -11,10 +11,10 @@ import ( "reflect" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/categories" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) // run before router/init.go:init() diff --git a/templates/template_test.go b/templates/template_test.go index 70a1b24e3..4395d217b 100644 --- a/templates/template_test.go +++ b/templates/template_test.go @@ -9,22 +9,22 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/utils/upload" - "github.com/NyaaPantsu/nyaa/utils/validator/announcement" + "github.com/HoloPirates/mogupantsu/utils/upload" + "github.com/HoloPirates/mogupantsu/utils/validator/announcement" "strings" "time" "github.com/CloudyKit/jet" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/filelist" - "github.com/NyaaPantsu/nyaa/utils/oauth2/client" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/validator/api" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/filelist" + "github.com/HoloPirates/mogupantsu/utils/oauth2/client" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/validator/api" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" ) diff --git a/translations/en-us.all.json b/translations/en-us.all.json index 7307e4453..3d7f9b6eb 100644 --- a/translations/en-us.all.json +++ b/translations/en-us.all.json @@ -15,6 +15,10 @@ "id": "asia", "translation": "Asian related content only (no Western Movies, no Cartoon)" }, + { + "id": "vtuber_content", + "translation": "Vtuber related content only" + }, { "id": "rules_spam", "translation": "No spam" @@ -25,7 +29,7 @@ }, { "id": "rule_tracker_url", - "translation": "https://uw0.xyz/ is the official announce URL" + "translation": "udp://tracker.holopirates.moe:1337/announce is the official announce URL" }, { "id": "verify_email_title", @@ -404,132 +408,40 @@ "translation": "Select a Torrent Category" }, { - "id": "anime", - "translation": "Anime" - }, - { - "id": "anime_amv", - "translation": "Anime - Anime Music Video" - }, - { - "id": "anime_english_translated", - "translation": "Anime - English-translated" - }, - { - "id": "anime_non_english_translated", - "translation": "Anime - Non-English-translated" - }, - { - "id": "anime_raw", - "translation": "Anime - Raw" - }, - { - "id": "audio", - "translation": "Audio" - }, - { - "id": "audio_lossless", - "translation": "Audio - Lossless" - }, - { - "id": "audio_lossy", - "translation": "Audio - Lossy" - }, - { - "id": "literature", - "translation": "Literature" - }, - { - "id": "literature_english_translated", - "translation": "Literature - English-translated" - }, - { - "id": "literature_raw", - "translation": "Literature - Raw" - }, - { - "id": "literature_non_english_translated", - "translation": "Literature - Non-English-translated" - }, - { - "id": "live_action", - "translation": "Live Action" - }, - { - "id": "live_action_english_translated", - "translation": "Live Action - English-translated" - }, - { - "id": "live_action_idol_pv", - "translation": "Live Action - Idol/Promotional Video" - }, - { - "id": "live_action_non_english_translated", - "translation": "Live Action - Non-English-translated" - }, - { - "id": "live_action_raw", - "translation": "Live Action - Raw" - }, - { - "id": "pictures", - "translation": "Pictures" - }, - { - "id": "pictures_graphics", - "translation": "Pictures - Graphics" + "id": "unarchived", + "translation": "Unarchived" }, { - "id": "pictures_photos", - "translation": "Pictures - Photos" + "id": "unarchived_karaoke", + "translation": "Unarchived - Karaoke" }, { - "id": "software", - "translation": "Software" + "id": "unarchived_copyright", + "translation": "Unarchived - Copyright" }, { - "id": "software_applications", - "translation": "Software - Applications" + "id": "unarchived_yab", + "translation": "Unarchived - Yab" }, { - "id": "software_games", - "translation": "Software - Games" + "id": "paid", + "translation": "Paid" }, { - "id": "art", - "translation": "Art" + "id": "paid_membership", + "translation": "Paid - Membership" }, { - "id": "art_anime", - "translation": "Art - Anime" + "id": "paid_voice_pack", + "translation": "Paid - Voice Pack" }, { - "id": "art_doujinshi", - "translation": "Art - Doujinshi" + "id": "paid_concert", + "translation": "Paid - Concert" }, { - "id": "art_games", - "translation": "Art - Games" - }, - { - "id": "art_manga", - "translation": "Art - Manga" - }, - { - "id": "art_pictures", - "translation": "Art - Pictures" - }, - { - "id": "real_life", - "translation": "Real Life" - }, - { - "id": "real_life_photobooks_and_pictures", - "translation": "Real Life - Photobooks and Pictures" - }, - { - "id": "real_life_videos", - "translation": "Real Life - Videos" + "id": "paid_songs", + "translation": "Paid - Songs" }, { "id": "torrent_description", @@ -2115,6 +2027,10 @@ "id": "tagtype_vndbid", "translation": "VNdb ID" }, + { + "id": "tagtype_youtubeid", + "translation": "Youtube ID" + }, { "id": "tagtype_videoquality", "translation": "Video Quality" @@ -2292,12 +2208,12 @@ "translation": "Upload to other websites" }, { - "id":"choose_category", + "id": "choose_category", "translation": "Choose a category (required)" }, { - "id":"choose_language", - "translation":"Choose a language (required)" + "id": "choose_language", + "translation": "Choose a language (required)" }, { "id": "event", @@ -2319,4 +2235,4 @@ "id": "guidelines", "translation": "Guidelines" } -] +] \ No newline at end of file diff --git a/utils/api/response.go b/utils/api/response.go index cd0db8777..5e268dca8 100644 --- a/utils/api/response.go +++ b/utils/api/response.go @@ -3,7 +3,7 @@ package apiUtils import ( "net/http" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" ) diff --git a/utils/categories/categories.go b/utils/categories/categories.go index 632b1cf3f..e4a1e645c 100644 --- a/utils/categories/categories.go +++ b/utils/categories/categories.go @@ -3,7 +3,7 @@ package categories import ( "sort" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // Category is a struct defining a category diff --git a/utils/categories/categories_test.go b/utils/categories/categories_test.go index d4ea7d375..ee2ebabf5 100644 --- a/utils/categories/categories_test.go +++ b/utils/categories/categories_test.go @@ -8,7 +8,7 @@ import ( "reflect" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // run before config/parse.go:init() diff --git a/utils/cookies/helpers.go b/utils/cookies/helpers.go index 20625693e..e5db0d47e 100644 --- a/utils/cookies/helpers.go +++ b/utils/cookies/helpers.go @@ -1,7 +1,7 @@ package cookies import ( - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) func getDomainName() string { diff --git a/utils/cookies/user.go b/utils/cookies/user.go index 9218a1fa3..8cf5c9e82 100644 --- a/utils/cookies/user.go +++ b/utils/cookies/user.go @@ -7,12 +7,12 @@ import ( "strconv" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/timeHelper" - "github.com/NyaaPantsu/nyaa/utils/validator/user" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/timeHelper" + "github.com/HoloPirates/mogupantsu/utils/validator/user" "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" ) diff --git a/utils/debug/debug.go b/utils/debug/debug.go index 6145e49b1..1a8b890d4 100644 --- a/utils/debug/debug.go +++ b/utils/debug/debug.go @@ -3,7 +3,7 @@ package debug import ( "runtime" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/utils/log" ) func LogCaller(parent int) { diff --git a/utils/email/email.go b/utils/email/email.go index 2a72f1b19..299cf1a90 100644 --- a/utils/email/email.go +++ b/utils/email/email.go @@ -3,8 +3,8 @@ package email import ( "path/filepath" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/log" "gopkg.in/gomail.v2" ) diff --git a/utils/email/verification.go b/utils/email/verification.go index ea4d06b71..b20673481 100644 --- a/utils/email/verification.go +++ b/utils/email/verification.go @@ -7,12 +7,12 @@ import ( "strconv" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/format" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/timeHelper" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/format" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/timeHelper" "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" ) diff --git a/utils/feeds/convert.go b/utils/feeds/convert.go index c4b5f882c..1fa0b83e9 100644 --- a/utils/feeds/convert.go +++ b/utils/feeds/convert.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/categories" ) // ConvertToCat : Convert a torznab cat to our cat diff --git a/utils/filelist/filelist.go b/utils/filelist/filelist.go index 56dd8498c..e1fafc114 100644 --- a/utils/filelist/filelist.go +++ b/utils/filelist/filelist.go @@ -3,7 +3,7 @@ package filelist import ( "strings" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" "github.com/bradfitz/slice" ) diff --git a/utils/format/format_test.go b/utils/format/format_test.go index af4213cbd..5a8c17c07 100644 --- a/utils/format/format_test.go +++ b/utils/format/format_test.go @@ -6,7 +6,7 @@ import ( "math" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // run before config/parse.go:init() diff --git a/utils/log/logger.go b/utils/log/logger.go index e416b41a6..20a114978 100644 --- a/utils/log/logger.go +++ b/utils/log/logger.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/Sirupsen/logrus" lumberjack "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/utils/messages/messages.go b/utils/messages/messages.go index 41b737da7..eefea8ecb 100644 --- a/utils/messages/messages.go +++ b/utils/messages/messages.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/NyaaPantsu/nyaa/models/notifications" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/sanitize" + "github.com/HoloPirates/mogupantsu/models/notifications" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/sanitize" "github.com/gin-gonic/gin" "github.com/nicksnyder/go-i18n/i18n" ) diff --git a/utils/oauth2/helpers.go b/utils/oauth2/helpers.go index 3eea9dd57..becbe3b96 100644 --- a/utils/oauth2/helpers.go +++ b/utils/oauth2/helpers.go @@ -5,10 +5,10 @@ import ( "crypto/rsa" "time" - "github.com/NyaaPantsu/nyaa/utils/oauth2/storage" + "github.com/HoloPirates/mogupantsu/utils/oauth2/storage" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/oauth2/manager" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/oauth2/manager" "github.com/ory/fosite" "github.com/ory/fosite/compose" "github.com/ory/fosite/handler/openid" diff --git a/utils/oauth2/manager/manager_sql.go b/utils/oauth2/manager/manager_sql.go index 41910ee14..173ea61e5 100644 --- a/utils/oauth2/manager/manager_sql.go +++ b/utils/oauth2/manager/manager_sql.go @@ -6,10 +6,10 @@ import ( "net/http" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/oauth_client" - "github.com/NyaaPantsu/nyaa/utils/format" - "github.com/NyaaPantsu/nyaa/utils/oauth2/client" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/oauth_client" + "github.com/HoloPirates/mogupantsu/utils/format" + "github.com/HoloPirates/mogupantsu/utils/oauth2/client" "github.com/ory/fosite" "github.com/pborman/uuid" "github.com/pkg/errors" diff --git a/utils/oauth2/storage/storage.go b/utils/oauth2/storage/storage.go index 76426f3a3..51d15ce3d 100644 --- a/utils/oauth2/storage/storage.go +++ b/utils/oauth2/storage/storage.go @@ -6,10 +6,10 @@ import ( "encoding/json" "strings" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/oauth_server" - "github.com/NyaaPantsu/nyaa/models/users" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/oauth_server" + "github.com/HoloPirates/mogupantsu/models/users" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/ory/fosite" "github.com/pkg/errors" ) diff --git a/utils/publicSettings/publicSettings.go b/utils/publicSettings/publicSettings.go index 3af0ecbcc..56588d4bb 100644 --- a/utils/publicSettings/publicSettings.go +++ b/utils/publicSettings/publicSettings.go @@ -11,9 +11,9 @@ import ( "sort" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/timeHelper" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/timeHelper" "github.com/gin-gonic/gin" "github.com/nicksnyder/go-i18n/i18n" "github.com/nicksnyder/go-i18n/i18n/language" diff --git a/utils/publicSettings/publicSettings_test.go b/utils/publicSettings/publicSettings_test.go index 471fdd23b..ddc51d13b 100644 --- a/utils/publicSettings/publicSettings_test.go +++ b/utils/publicSettings/publicSettings_test.go @@ -12,7 +12,7 @@ import ( "strings" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // run before config/parse.go:init() diff --git a/utils/sanitize/markdown.go b/utils/sanitize/markdown.go index d63385263..67d1f57fe 100644 --- a/utils/sanitize/markdown.go +++ b/utils/sanitize/markdown.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/frustra/bbcode" "github.com/microcosm-cc/bluemonday" diff --git a/utils/search/cache.go b/utils/search/cache.go index 18f731c2b..18f99433a 100644 --- a/utils/search/cache.go +++ b/utils/search/cache.go @@ -1,6 +1,6 @@ package search -import "github.com/NyaaPantsu/nyaa/models" +import "github.com/HoloPirates/mogupantsu/models" // TorrentCache torrent cache struct type TorrentCache struct { diff --git a/utils/search/categories.go b/utils/search/categories.go index af7a25e63..f396357ee 100644 --- a/utils/search/categories.go +++ b/utils/search/categories.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/categories" ) // Categories multiple torrent categories diff --git a/utils/search/categories_test.go b/utils/search/categories_test.go index 701035e28..38f4f43ab 100644 --- a/utils/search/categories_test.go +++ b/utils/search/categories_test.go @@ -4,8 +4,8 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/categories" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/categories" "github.com/stretchr/testify/assert" ) diff --git a/utils/search/helpers.go b/utils/search/helpers.go index 74325994c..2da3162a3 100644 --- a/utils/search/helpers.go +++ b/utils/search/helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/NyaaPantsu/nyaa/models/torrents" + "github.com/HoloPirates/mogupantsu/models/torrents" ) func tagsToID(tags string) []string { diff --git a/utils/search/languages.go b/utils/search/languages.go index 8fe653a3e..745c82e7e 100644 --- a/utils/search/languages.go +++ b/utils/search/languages.go @@ -3,7 +3,7 @@ package search import ( "strings" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) // ParseLanguages sets languages by string diff --git a/utils/search/languages_test.go b/utils/search/languages_test.go index 0eea2b1c4..7e0dc23d8 100644 --- a/utils/search/languages_test.go +++ b/utils/search/languages_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" "github.com/stretchr/testify/assert" ) diff --git a/utils/search/maxtype.go b/utils/search/maxtype.go index 833003203..6609e865a 100644 --- a/utils/search/maxtype.go +++ b/utils/search/maxtype.go @@ -3,7 +3,7 @@ package search import ( "strconv" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) type maxType uint32 diff --git a/utils/search/maxtype_test.go b/utils/search/maxtype_test.go index a714b7b13..cc314f9f8 100644 --- a/utils/search/maxtype_test.go +++ b/utils/search/maxtype_test.go @@ -3,7 +3,7 @@ package search import ( "testing" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/stretchr/testify/assert" ) diff --git a/utils/search/query.go b/utils/search/query.go index faa173b4d..84d03509d 100644 --- a/utils/search/query.go +++ b/utils/search/query.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "gopkg.in/olivere/elastic.v5" ) diff --git a/utils/search/search.go b/utils/search/search.go index f66d2904c..cf91c2ded 100644 --- a/utils/search/search.go +++ b/utils/search/search.go @@ -3,10 +3,10 @@ package search import ( "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cache" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cache" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/gin-gonic/gin" ) diff --git a/utils/search/sortmode.go b/utils/search/sortmode.go index 2facb10d7..94f55dbe6 100644 --- a/utils/search/sortmode.go +++ b/utils/search/sortmode.go @@ -1,6 +1,6 @@ package search -import "github.com/NyaaPantsu/nyaa/config" +import "github.com/HoloPirates/mogupantsu/config" const ( ID SortMode = iota diff --git a/utils/search/tags.go b/utils/search/tags.go index 1950a364c..5fd5e74e1 100644 --- a/utils/search/tags.go +++ b/utils/search/tags.go @@ -3,7 +3,7 @@ package search import ( "strings" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" ) // Tags struct for search diff --git a/utils/search/torrentParam.go b/utils/search/torrentParam.go index 22db67bce..f7b4b7488 100644 --- a/utils/search/torrentParam.go +++ b/utils/search/torrentParam.go @@ -9,15 +9,15 @@ import ( "unicode" "unicode/utf8" - "github.com/NyaaPantsu/nyaa/models/users" + "github.com/HoloPirates/mogupantsu/models/users" elastic "gopkg.in/olivere/elastic.v5" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/models/torrents" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/models/torrents" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" "github.com/gin-gonic/gin" ) diff --git a/utils/search/torrentParam_test.go b/utils/search/torrentParam_test.go index 2b19d04c5..a501f3a13 100644 --- a/utils/search/torrentParam_test.go +++ b/utils/search/torrentParam_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" ) diff --git a/utils/signals/interrupt.go b/utils/signals/interrupt.go index 5d87a7faa..90b31e167 100644 --- a/utils/signals/interrupt.go +++ b/utils/signals/interrupt.go @@ -3,7 +3,7 @@ package signals import ( "sync" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/utils/log" ) // registered interrupt callbacks. diff --git a/utils/timeHelper/time_helper.go b/utils/timeHelper/time_helper.go index 10df3b5ec..99965935e 100644 --- a/utils/timeHelper/time_helper.go +++ b/utils/timeHelper/time_helper.go @@ -3,7 +3,7 @@ package timeHelper import ( "time" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/utils/log" ) // FewDaysLater : Give time now + some days diff --git a/utils/torrentLanguages/torrent_languages.go b/utils/torrentLanguages/torrent_languages.go index 3b7439059..ac3e759b6 100644 --- a/utils/torrentLanguages/torrent_languages.go +++ b/utils/torrentLanguages/torrent_languages.go @@ -3,8 +3,8 @@ package torrentLanguages import ( "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) var torrentLanguages publicSettings.Languages diff --git a/utils/torrentLanguages/torrent_languages_test.go b/utils/torrentLanguages/torrent_languages_test.go index 547492aed..c7a1aafd2 100644 --- a/utils/torrentLanguages/torrent_languages_test.go +++ b/utils/torrentLanguages/torrent_languages_test.go @@ -8,8 +8,8 @@ import ( "fmt" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" ) // run before config/parse.go:init() diff --git a/utils/upload/categories.go b/utils/upload/categories.go index 47a6455b9..f9488ffa6 100644 --- a/utils/upload/categories.go +++ b/utils/upload/categories.go @@ -3,8 +3,8 @@ package upload import ( "fmt" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" ) // Convert automatically our sukebei cats to platform specified Hentai cats diff --git a/utils/upload/categories_test.go b/utils/upload/categories_test.go index cc37a676f..67186874b 100644 --- a/utils/upload/categories_test.go +++ b/utils/upload/categories_test.go @@ -3,8 +3,8 @@ package upload import ( "testing" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" "github.com/stretchr/testify/assert" ) diff --git a/utils/upload/generate.go b/utils/upload/generate.go index 973b11306..38485a604 100644 --- a/utils/upload/generate.go +++ b/utils/upload/generate.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/format" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/format" + "github.com/HoloPirates/mogupantsu/utils/log" "github.com/anacrolix/dht" "github.com/anacrolix/torrent" "github.com/anacrolix/torrent/bencode" diff --git a/utils/upload/multi.go b/utils/upload/multi.go index f4e3d7683..bc29e91af 100644 --- a/utils/upload/multi.go +++ b/utils/upload/multi.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/cache" - "github.com/NyaaPantsu/nyaa/utils/log" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/cache" + "github.com/HoloPirates/mogupantsu/utils/log" ) const ( diff --git a/utils/upload/upload.go b/utils/upload/upload.go index f57315fa1..aef898e51 100644 --- a/utils/upload/upload.go +++ b/utils/upload/upload.go @@ -4,15 +4,15 @@ import ( "reflect" "strings" - "github.com/NyaaPantsu/nyaa/utils/validator/tag" + "github.com/HoloPirates/mogupantsu/utils/validator/tag" - "github.com/NyaaPantsu/nyaa/models/tag" + "github.com/HoloPirates/mogupantsu/models/tag" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/sanitize" - "github.com/NyaaPantsu/nyaa/utils/search" - "github.com/NyaaPantsu/nyaa/utils/validator/torrent" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/sanitize" + "github.com/HoloPirates/mogupantsu/utils/search" + "github.com/HoloPirates/mogupantsu/utils/validator/torrent" "github.com/gin-gonic/gin" ) diff --git a/utils/validator/api/forms_test.go b/utils/validator/api/forms_test.go index 7e151a700..81374cd0d 100644 --- a/utils/validator/api/forms_test.go +++ b/utils/validator/api/forms_test.go @@ -5,10 +5,10 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" "github.com/gin-gonic/gin" ) diff --git a/utils/validator/api/functions.go b/utils/validator/api/functions.go index 99a333da9..b22b19e8c 100644 --- a/utils/validator/api/functions.go +++ b/utils/validator/api/functions.go @@ -3,8 +3,8 @@ package apiValidator import ( "strings" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/sanitize" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/sanitize" ) func (form *CreateForm) Bind(d *models.OauthClient) *models.OauthClient { diff --git a/utils/validator/api/functions_test.go b/utils/validator/api/functions_test.go index 82c959a74..2f0e9d50c 100644 --- a/utils/validator/api/functions_test.go +++ b/utils/validator/api/functions_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/NyaaPantsu/nyaa/models" + "github.com/HoloPirates/mogupantsu/models" ) func TestCreateForm_Bind(t *testing.T) { diff --git a/utils/validator/number.go b/utils/validator/number.go index 817afdc5c..3a84ba18e 100644 --- a/utils/validator/number.go +++ b/utils/validator/number.go @@ -1,7 +1,7 @@ package validator import ( - "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/go-playground/validator" ) diff --git a/utils/validator/slices.go b/utils/validator/slices.go index d02e600a8..cdb0fd4b8 100644 --- a/utils/validator/slices.go +++ b/utils/validator/slices.go @@ -1,7 +1,7 @@ package validator import ( - "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/go-playground/validator" ) diff --git a/utils/validator/string.go b/utils/validator/string.go index adcb0b6f6..676d5003e 100644 --- a/utils/validator/string.go +++ b/utils/validator/string.go @@ -1,7 +1,7 @@ package validator import ( - "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/go-playground/validator" ) diff --git a/utils/validator/struct.go b/utils/validator/struct.go index 652f1f5ca..44c991258 100644 --- a/utils/validator/struct.go +++ b/utils/validator/struct.go @@ -1,7 +1,7 @@ package validator import ( - "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/go-playground/validator" ) diff --git a/utils/validator/tag/functions.go b/utils/validator/tag/functions.go index 6a2168b68..a04e364eb 100644 --- a/utils/validator/tag/functions.go +++ b/utils/validator/tag/functions.go @@ -1,7 +1,7 @@ package tagsValidator import ( - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/gin-gonic/gin" ) diff --git a/utils/validator/tag/functions_test.go b/utils/validator/tag/functions_test.go index de4d2fc9f..20e63fd3e 100644 --- a/utils/validator/tag/functions_test.go +++ b/utils/validator/tag/functions_test.go @@ -6,7 +6,7 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" ) diff --git a/utils/validator/torrent/forms.go b/utils/validator/torrent/forms.go index ae08e745b..a3046a0df 100644 --- a/utils/validator/torrent/forms.go +++ b/utils/validator/torrent/forms.go @@ -1,7 +1,7 @@ package torrentValidator import ( - "github.com/NyaaPantsu/nyaa/utils/validator/tag" + "github.com/HoloPirates/mogupantsu/utils/validator/tag" ) // TorrentRequest struct diff --git a/utils/validator/torrent/functions.go b/utils/validator/torrent/functions.go index 2c83584ac..8f53e6f8c 100644 --- a/utils/validator/torrent/functions.go +++ b/utils/validator/torrent/functions.go @@ -11,12 +11,12 @@ import ( "strconv" "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/utils/categories" - "github.com/NyaaPantsu/nyaa/utils/cookies" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/torrentLanguages" - "github.com/NyaaPantsu/nyaa/utils/validator/tag" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/cookies" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/torrentLanguages" + "github.com/HoloPirates/mogupantsu/utils/validator/tag" "github.com/anacrolix/torrent/metainfo" "github.com/gin-gonic/gin" ) diff --git a/utils/validator/torrent/functions_test.go b/utils/validator/torrent/functions_test.go index 070291f00..3bd10dcb2 100644 --- a/utils/validator/torrent/functions_test.go +++ b/utils/validator/torrent/functions_test.go @@ -6,11 +6,11 @@ import ( "strings" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - "github.com/NyaaPantsu/nyaa/utils/categories" - "github.com/NyaaPantsu/nyaa/utils/publicSettings" - "github.com/NyaaPantsu/nyaa/utils/validator/tag" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + "github.com/HoloPirates/mogupantsu/utils/categories" + "github.com/HoloPirates/mogupantsu/utils/publicSettings" + "github.com/HoloPirates/mogupantsu/utils/validator/tag" "github.com/stretchr/testify/assert" ) diff --git a/utils/validator/torrent/helpers.go b/utils/validator/torrent/helpers.go index 070650e45..83da51900 100644 --- a/utils/validator/torrent/helpers.go +++ b/utils/validator/torrent/helpers.go @@ -4,7 +4,7 @@ import ( "net/url" "strings" - "github.com/NyaaPantsu/nyaa/config" + "github.com/HoloPirates/mogupantsu/config" "github.com/anacrolix/torrent/metainfo" ) diff --git a/utils/validator/user/forms_test.go b/utils/validator/user/forms_test.go index c9460e62d..0de007756 100644 --- a/utils/validator/user/forms_test.go +++ b/utils/validator/user/forms_test.go @@ -5,10 +5,10 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - msg "github.com/NyaaPantsu/nyaa/utils/messages" - "github.com/NyaaPantsu/nyaa/utils/validator" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + msg "github.com/HoloPirates/mogupantsu/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/validator" "github.com/gin-gonic/gin" ) diff --git a/utils/validator/user/functions.go b/utils/validator/user/functions.go index 188136d16..a146e3b8d 100644 --- a/utils/validator/user/functions.go +++ b/utils/validator/user/functions.go @@ -3,8 +3,8 @@ package userValidator import ( "regexp" - "github.com/NyaaPantsu/nyaa/utils/log" - "github.com/NyaaPantsu/nyaa/utils/validator" + "github.com/HoloPirates/mogupantsu/utils/log" + "github.com/HoloPirates/mogupantsu/utils/validator" ) // Regex by: Philippe Verdy (in a comment somewhere on a website) - Valid every email RFC valid diff --git a/utils/validator/validator.go b/utils/validator/validator.go index e431d9a1e..3bdf11a39 100644 --- a/utils/validator/validator.go +++ b/utils/validator/validator.go @@ -8,8 +8,8 @@ import ( "strconv" - "github.com/NyaaPantsu/nyaa/utils/log" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/utils/log" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/go-playground/validator" ) diff --git a/utils/validator/validator_test.go b/utils/validator/validator_test.go index b9eb62d86..56dff8779 100644 --- a/utils/validator/validator_test.go +++ b/utils/validator/validator_test.go @@ -5,9 +5,9 @@ import ( "path" "testing" - "github.com/NyaaPantsu/nyaa/config" - "github.com/NyaaPantsu/nyaa/models" - msg "github.com/NyaaPantsu/nyaa/utils/messages" + "github.com/HoloPirates/mogupantsu/config" + "github.com/HoloPirates/mogupantsu/models" + msg "github.com/HoloPirates/mogupantsu/utils/messages" "github.com/gin-gonic/gin" )