From b1ab6acd143306ae8ca15391e34b6ba2ef0e4bd7 Mon Sep 17 00:00:00 2001 From: Eliot Whalan Date: Tue, 9 May 2017 10:17:11 +1000 Subject: [PATCH 01/13] Re-disable uploads --- config/upload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/upload.go b/config/upload.go index 4d97d628..dd4d85aa 100644 --- a/config/upload.go +++ b/config/upload.go @@ -4,5 +4,5 @@ const ( // TorrentFileStorage = "/var/tmp/torrent_outgoing" TorrentFileStorage = "" //disable uploads by default - UploadsDisabled = 0 + UploadsDisabled = 1 ) From a1e63a330c4e7fe7bf4188cfb777cea63c6792dc Mon Sep 17 00:00:00 2001 From: Austin Date: Mon, 8 May 2017 20:19:39 -0500 Subject: [PATCH 02/13] Make reg confirmation less cringy --- service/user/locale/en-us.all.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/user/locale/en-us.all.json b/service/user/locale/en-us.all.json index 1848b60c..0a0bd08a 100644 --- a/service/user/locale/en-us.all.json +++ b/service/user/locale/en-us.all.json @@ -93,7 +93,7 @@ }, { "id":"sign_up_success", - "translation": "Almost Signed Up!" + "translation": "Thank you for registering!" }, { "id":"verify_success", @@ -101,7 +101,7 @@ }, { "id":"signup_verification_email", - "translation": "Now, you are one step left before being part of our community! Check your emails (inbox or spam folder) and click the link provided for activating your account!" + "translation": "Now, as the final step of registration please check your mail inbox (or spam) and click the link provided for activating your account!" }, { "id":"settings", From 84cf511fe36e7161d9c9c65fc621952a32ad5e0b Mon Sep 17 00:00:00 2001 From: akuma06 Date: Tue, 9 May 2017 03:36:48 +0200 Subject: [PATCH 03/13] Fixed User Profile Page, badge menu, every thing before previous commit (except email) Added Logout --- db/gorm.go | 3 +- model/user.go | 20 +++-- public/css/style.css | 117 +++++++++++++++++++++++++- router/router.go | 2 + router/template.go | 7 +- router/templateFunctions.go | 7 ++ router/templateVariables.go | 30 ++++--- router/userHandler.go | 26 ++++++ service/user/permission/permission.go | 29 ++++--- service/user/user.go | 5 +- templates/_badgemenu.html | 11 +-- templates/_user_list_torrents.html | 48 +++++++++++ templates/user/profile.html | 62 ++++++++++++++ util/languages/translation.go | 1 + 14 files changed, 330 insertions(+), 38 deletions(-) create mode 100644 templates/_user_list_torrents.html create mode 100644 templates/user/profile.html diff --git a/db/gorm.go b/db/gorm.go index 67c32450..bdbf3d1c 100644 --- a/db/gorm.go +++ b/db/gorm.go @@ -30,8 +30,7 @@ func GormInit(conf *config.Config) (*gorm.DB, error) { // db.SingularTable(true) if config.Environment == "DEVELOPMENT" { db.LogMode(true) - db.AutoMigrate(&model.User{}, &model.UserFollows{}) - db.AutoMigrate(&model.User{}, &model.Torrents{}, &model.Comment{}, &model.OldComment{}) + db.AutoMigrate(&model.Torrents{}, &model.UsersFollowers{}, &model.User{}, &model.Comment{}, &model.OldComment{}) // db.Model(&model.User{}).AddIndex("idx_user_token", "token") } diff --git a/model/user.go b/model/user.go index d2064b2b..e4533b79 100644 --- a/model/user.go +++ b/model/user.go @@ -17,17 +17,25 @@ type User struct { UpdatedAt time.Time `gorm:"column:updated_at"` /*Api*/Token string `gorm:"column:api_token"` //ApiTokenExpiry + + // Liking + LikingCount int `json:"likingCount"` + LikedCount int `json:"likedCount"` + Likings []User `gorm:"foreignkey:userId;associationforeignkey:follower_id;many2many:users_followers;"` + Liked []User `gorm:"foreignkey:follower_id;associationforeignkey:userId;many2many:users_followers;"` + + Md5 string `json:"md5"` TokenExpiration time.Time `gorm:"column:api_token_expiry"` Language string `gorm:"column:language"` + Torrents []Torrents `gorm:"ForeignKey:owner_id"` } type PublicUser struct { User *User } -type UserFollows struct { - User User `gorm:"ForeignKey:user_id"` - Following User `gorm:"ForeignKey:following"` -} - - +// UsersFollowers is a relation table to relate users each other. +type UsersFollowers struct { + UserID uint `gorm:"column:userId"` + FollowerID uint `gorm:"column:follower_id"` +} \ No newline at end of file diff --git a/public/css/style.css b/public/css/style.css index 8932a359..da2d9089 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -203,6 +203,119 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ left: -5px; } -#mainmenu .badgemenu { - padding-top: 0; +#mainmenu .badgemenu .profile-image { + line-height: 35px; } + +#mainmenu .navbar-header, #mainmenu .navbar-nav, #mainmenu .navbar-form { + padding-top: 10px; +} + +#mainmenu .badgemenu { + padding-top: 0; +} + +/* PROFILE PAGE */ +/* Profile container */ +.profile { + margin: 20px 0; +} + +/* Profile sidebar */ +.profile-sidebar { + padding: 20px 0 10px 0; + background: #182430; +} + +.profile-userpic img { + float: none; + margin: 0 auto; + width: 50%; + height: 50%; + -webkit-border-radius: 50% !important; + -moz-border-radius: 50% !important; + border-radius: 50% !important; +} + +.profile-usertitle { + text-align: center; + margin-top: 20px; +} + +.profile-usertitle-name { + color: #5a7391; + font-size: 16px; + font-weight: 600; + margin-bottom: 7px; +} + +.profile-usertitle-job { + text-transform: uppercase; + color: #5b9bd1; + font-size: 12px; + font-weight: 600; + margin-bottom: 15px; +} + +.profile-userbuttons { + text-align: center; + margin-top: 10px; +} + +.profile-userbuttons .btn { + text-transform: uppercase; + font-size: 11px; + font-weight: 600; + padding: 6px 15px; + margin-right: 5px; +} + +.profile-userbuttons .btn:last-child { + margin-right: 0px; +} + +.profile-usermenu { + margin-top: 30px; +} + +.profile-usermenu ul li { + border-bottom: 1px solid #f0f4f7; +} + +.profile-usermenu ul li:last-child { + border-bottom: none; +} + +.profile-usermenu ul li a { + color: #93a3b5; + font-size: 14px; + font-weight: 400; +} + +.profile-usermenu ul li a i { + margin-right: 8px; + font-size: 14px; +} + +.profile-usermenu ul li a:hover { + background-color: #fafcfd; + color: #5b9bd1; +} + +.profile-usermenu ul li.active { + border-bottom: none; +} + +.profile-usermenu ul li.active a { + color: #5b9bd1; + background-color: #f6f9fb; + border-left: 2px solid #5b9bd1; + margin-left: -2px; +} + +/* Profile Content */ +.profile-content { + padding: 20px; + background: #fff; + min-height: 460px; +} \ No newline at end of file diff --git a/router/router.go b/router/router.go index b9e5c5a5..362ad030 100644 --- a/router/router.go +++ b/router/router.go @@ -33,6 +33,7 @@ func init() { gzipUserVerifyEmailHandler := handlers.CompressHandler(http.HandlerFunc(UserVerifyEmailHandler)) gzipUserRegisterPostHandler := handlers.CompressHandler(http.HandlerFunc(UserRegisterPostHandler)) gzipUserLoginPostHandler := handlers.CompressHandler(http.HandlerFunc(UserLoginPostHandler)) + gzipUserLogoutHandler := handlers.CompressHandler(http.HandlerFunc(UserLogoutHandler)) gzipUserProfileHandler := handlers.CompressHandler(http.HandlerFunc(UserProfileHandler)) Router = mux.NewRouter() @@ -58,6 +59,7 @@ func init() { Router.Handle("/verify/email/{token}", gzipUserVerifyEmailHandler).Name("user_verify").Methods("GET") Router.Handle("/user/register", gzipUserRegisterPostHandler).Name("user_register").Methods("POST") Router.Handle("/user/login", gzipUserLoginPostHandler).Name("user_login").Methods("POST") + Router.Handle("/user/logout", gzipUserLogoutHandler).Name("user_logout") Router.Handle("/user/{id}/{username}", gzipUserProfileHandler).Name("user_profile").Methods("GET") Router.PathPrefix("/captcha").Methods("GET").HandlerFunc(captcha.ServeFiles) diff --git a/router/template.go b/router/template.go index 678a4ab2..4a26fdb4 100644 --- a/router/template.go +++ b/router/template.go @@ -7,7 +7,7 @@ import ( var TemplateDir = "templates" -var homeTemplate, searchTemplate, faqTemplate, uploadTemplate, viewTemplate, viewRegisterTemplate, viewLoginTemplate, viewRegisterSuccessTemplate, viewVerifySuccessTemplate *template.Template +var homeTemplate, searchTemplate, faqTemplate, uploadTemplate, viewTemplate, viewRegisterTemplate, viewLoginTemplate, viewRegisterSuccessTemplate, viewVerifySuccessTemplate, viewProfileTemplate *template.Template type templateLoader struct { templ **template.Template @@ -63,6 +63,11 @@ func ReloadTemplates() { name: "user_login", file: "user/login.html", }, + templateLoader{ + templ: &viewProfileTemplate, + name: "user_profile", + file: "user/profile.html", + }, } for _, templ := range templs { t := template.Must(template.New(templ.name).Funcs(FuncMap).ParseFiles(filepath.Join(TemplateDir, "index.html"), filepath.Join(TemplateDir, templ.file))) diff --git a/router/templateFunctions.go b/router/templateFunctions.go index 67536f61..974aa626 100644 --- a/router/templateFunctions.go +++ b/router/templateFunctions.go @@ -7,6 +7,7 @@ import ( "net/url" "strconv" "github.com/nicksnyder/go-i18n/i18n" + "github.com/ewhal/nyaa/service/user/permission" ) var FuncMap = template.FuncMap{ @@ -59,4 +60,10 @@ var FuncMap = template.FuncMap{ return template.HTML(ret) }, "T": i18n.IdentityTfunc, + "getAvatar": func (hash string, size int) string { + return "https://www.gravatar.com/avatar/"+hash+"?s="+strconv.Itoa(size) + }, + "CurrentOrAdmin": userPermission.CurrentOrAdmin, + "CurrentUserIdentical": userPermission.CurrentUserIdentical, + "GetRole": userPermission.GetRole, } diff --git a/router/templateVariables.go b/router/templateVariables.go index e73bcf15..9edccc65 100644 --- a/router/templateVariables.go +++ b/router/templateVariables.go @@ -20,7 +20,7 @@ import ( type FaqTemplateVariables struct { Navigation Navigation Search SearchForm - User model.User + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -28,7 +28,7 @@ type FaqTemplateVariables struct { type NotFoundTemplateVariables struct { Navigation Navigation Search SearchForm - User model.User + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -38,7 +38,7 @@ type ViewTemplateVariables struct { Captcha captcha.Captcha Search SearchForm Navigation Navigation - User model.User + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -48,7 +48,7 @@ type UserRegisterTemplateVariables struct { FormErrors map[string][]string Search SearchForm Navigation Navigation - User model.User + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -57,7 +57,7 @@ type UserVerifyTemplateVariables struct { FormErrors map[string][]string Search SearchForm Navigation Navigation - User model.User + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -67,7 +67,17 @@ type UserLoginFormVariables struct { FormErrors map[string][]string Search SearchForm Navigation Navigation - User model.User + User *model.User + URL *url.URL // For parsing Url in templates + Route *mux.Route // For getting current route in templates +} + +type UserProfileVariables struct { + UserProfile *model.User + FormErrors map[string][]string + Search SearchForm + Navigation Navigation + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -76,7 +86,7 @@ type HomeTemplateVariables struct { ListTorrents []model.TorrentsJson Search SearchForm Navigation Navigation - User model.User + User *model.User URL *url.URL // For parsing Url in templates Route *mux.Route // For getting current route in templates } @@ -85,7 +95,7 @@ type UploadTemplateVariables struct { Upload UploadForm Search SearchForm Navigation Navigation - User model.User + User *model.User URL *url.URL Route *mux.Route } @@ -136,7 +146,7 @@ func NewSearchForm(params ...string) (searchForm SearchForm) { return } -func GetUser(r *http.Request) model.User { +func GetUser(r *http.Request) *model.User { user, _ , _ := userService.RetrieveCurrentUser(r) - return user + return &user } diff --git a/router/userHandler.go b/router/userHandler.go index 8fad031d..2bcf105b 100644 --- a/router/userHandler.go +++ b/router/userHandler.go @@ -6,6 +6,7 @@ import ( "github.com/ewhal/nyaa/service/captcha" "github.com/ewhal/nyaa/service/user" "github.com/ewhal/nyaa/service/user/form" + "github.com/ewhal/nyaa/service/user/permission" "github.com/ewhal/nyaa/util/languages" "github.com/ewhal/nyaa/util/modelHelper" "github.com/gorilla/mux" @@ -48,7 +49,25 @@ func UserLoginFormHandler(w http.ResponseWriter, r *http.Request) { // Getting User Profile func UserProfileHandler(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + id := vars["id"] + userProfile, _, errorUser := userService.RetrieveUserForAdmin(id) + currentUser := GetUser(r) + view := r.URL.Query().Get("view") + if (errorUser == nil) { + if ((view == "edit")&&(userPermission.CurrentOrAdmin(currentUser, userProfile.Id))) { + } else { + languages.SetTranslationFromRequest(viewProfileTemplate, r, "en-us") + htv := UserProfileVariables{&userProfile, form.NewErrors(), NewSearchForm(), Navigation{}, currentUser, r.URL, mux.CurrentRoute(r)} + err := viewProfileTemplate.ExecuteTemplate(w, "index.html", htv) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } + } + } else { + NotFoundHandler(w, r) + } } // Getting View User Profile Update @@ -141,6 +160,13 @@ func UserLoginPostHandler(w http.ResponseWriter, r *http.Request) { } +// Logout +func UserLogoutHandler(w http.ResponseWriter, r *http.Request) { + _, _ = userService.ClearCookie(w) + url, _ := Router.Get("home").URL() + http.Redirect(w, r, url.String(), http.StatusSeeOther) +} + // Post Profule Update controller func UserProfilePostHandler(w http.ResponseWriter, r *http.Request) { diff --git a/service/user/permission/permission.go b/service/user/permission/permission.go index 9805f8ef..64edb7be 100644 --- a/service/user/permission/permission.go +++ b/service/user/permission/permission.go @@ -1,10 +1,7 @@ package userPermission import ( - "errors" - "net/http" "github.com/ewhal/nyaa/model" - "github.com/ewhal/nyaa/service/user" "github.com/ewhal/nyaa/util/log" ) @@ -20,14 +17,24 @@ func CurrentOrAdmin(user *model.User, userId uint) bool { } // CurrentUserIdentical check that userId is same as current user's Id. -func CurrentUserIdentical(r *http.Request, userId uint) (bool, error) { - currentUser, err := userService.CurrentUser(r) - if err != nil { - return false, errors.New("Auth failed.") - } - if currentUser.Id != userId { - return false, errors.New("User is not identical.") +func CurrentUserIdentical(user *model.User, userId uint) (bool) { + if user.Id != userId { + return false } - return true, nil + return true +} + +func GetRole(user *model.User) string { + switch user.Status { + case -1 : + return "Banned" + case 0 : + return "Member" + case 1 : + return "Trusted Member" + case 2 : + return "Moderator" + } + return "Member" } diff --git a/service/user/user.go b/service/user/user.go index a942afa8..072ec894 100644 --- a/service/user/user.go +++ b/service/user/user.go @@ -62,6 +62,7 @@ func CreateUserFromForm(registrationForm formStruct.RegistrationForm) (model.Use var user model.User log.Debugf("registrationForm %+v\n", registrationForm) modelHelper.AssignValue(&user, ®istrationForm) + user.Md5 = crypto.GenerateMD5Hash(user.Email) // Gravatar token, err := crypto.GenerateRandomToken32() if err != nil { return user, errors.New("Token not generated.") @@ -136,6 +137,7 @@ func RetrieveUsers() []*model.PublicUser { // UpdateUserCore updates a user. (Applying the modifed data of user). func UpdateUserCore(user *model.User) (int, error) { + user.Md5 = crypto.GenerateMD5Hash(user.Email) token, err := crypto.GenerateRandomToken32() if err != nil { return http.StatusInternalServerError, errors.New("Token not generated.") @@ -245,7 +247,7 @@ func RetrieveUserForAdmin(id string) (model.User, int, error) { if db.ORM.First(&user, id).RecordNotFound() { return user, http.StatusNotFound, errors.New("User is not found.") } - db.ORM.Model(&user) + db.ORM.Model(&user).Related("Torrents").Find(&model.Torrents{}) return user, http.StatusOK, nil } @@ -256,6 +258,7 @@ func RetrieveUsersForAdmin() []model.User { db.ORM.Find(&users) for _, user := range users { db.ORM.Model(&user) + db.ORM.Model(&user).Related("Torrents").Find(&model.Torrents{}) userArr = append(userArr, user) } return userArr diff --git a/templates/_badgemenu.html b/templates/_badgemenu.html index a0b62a0c..301875ce 100644 --- a/templates/_badgemenu.html +++ b/templates/_badgemenu.html @@ -3,17 +3,18 @@
  • {{if gt .Id 0}} - {{ .Username }} + + {{ .Username }} {{ else }} {{end}}
    • diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html new file mode 100644 index 00000000..ccbcd29b --- /dev/null +++ b/templates/_user_list_torrents.html @@ -0,0 +1,48 @@ +{{define "profile_content"}} +{{with .UserProfile}} +
    + + + + + + + + + {{ range .Torrents }} + + + + + + + + + {{end}} +
    {{T "category"}}{{T "name"}}{{T "date"}}{{T "size"}}{{T "links"}}
    + + + + + + {{.Name}} + + {{.Date}}{{.Filesize}} + + + + + + +
    + +
    +{{end}} +{{end}} diff --git a/templates/user/profile.html b/templates/user/profile.html new file mode 100644 index 00000000..0fddfb40 --- /dev/null +++ b/templates/user/profile.html @@ -0,0 +1,62 @@ +{{define "title"}}{{ T "profile_page" .UserProfile.Username }}{{end}} +{{define "contclass"}}cont-view{{end}} +{{define "content"}} +
    +{{with .UserProfile}} +
    +
    + +
    + {{.Username}} +
    + + +
    +
    + {{.Username}} +
    +
    + {{GetRole . }} +
    +
    + + +
    + {{if gt $.User.Id 0 }} + {{if not (CurrentUserIdentical $.User .Id) }} + + {{end}} + {{end}} + +
    + + +
    + +
    + +
    +
    +{{end}} +
    +
    + {{ block "profile_content" . }}{{end}} +
    +
    +
    +{{end}} \ No newline at end of file diff --git a/util/languages/translation.go b/util/languages/translation.go index 5639eb93..3bdd5d3b 100644 --- a/util/languages/translation.go +++ b/util/languages/translation.go @@ -4,6 +4,7 @@ import ( "github.com/nicksnyder/go-i18n/i18n" "fmt" "html/template" + "fmt" "net/http" ) From 81fa4aed00215b4e7504fcfb657a81a44a685ec1 Mon Sep 17 00:00:00 2001 From: Austin Date: Mon, 8 May 2017 21:07:43 -0500 Subject: [PATCH 04/13] what in import duplication --- util/languages/translation.go | 1 - 1 file changed, 1 deletion(-) diff --git a/util/languages/translation.go b/util/languages/translation.go index 3bdd5d3b..5639eb93 100644 --- a/util/languages/translation.go +++ b/util/languages/translation.go @@ -4,7 +4,6 @@ import ( "github.com/nicksnyder/go-i18n/i18n" "fmt" "html/template" - "fmt" "net/http" ) From be6e573465800d907477c453994a102d8ce0aa53 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Tue, 9 May 2017 03:44:25 +0200 Subject: [PATCH 05/13] Moved translations in appropriate directory --- main.go | 2 +- {service/user/locale => translations}/en-us.all.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {service/user/locale => translations}/en-us.all.json (100%) diff --git a/main.go b/main.go index f697cc9d..3dc344ba 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,7 @@ import ( func initI18N() { /* Initialize the languages translation */ - i18n.MustLoadTranslationFile("service/user/locale/en-us.all.json") + i18n.MustLoadTranslationFile("translations/en-us.all.json") } func RunServer(conf *config.Config) { diff --git a/service/user/locale/en-us.all.json b/translations/en-us.all.json similarity index 100% rename from service/user/locale/en-us.all.json rename to translations/en-us.all.json From c5b22ff4960471003d790dc19ccac47507f1e128 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Tue, 9 May 2017 03:53:31 +0200 Subject: [PATCH 06/13] Fixed no torrents found + translation --- templates/_badgemenu.html | 8 ++++---- templates/_user_list_torrents.html | 4 ++++ translations/en-us.all.json | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/_badgemenu.html b/templates/_badgemenu.html index 301875ce..8dbdd136 100644 --- a/templates/_badgemenu.html +++ b/templates/_badgemenu.html @@ -8,13 +8,13 @@ {{ else }} - + {{end}} diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html index ccbcd29b..d5518975 100644 --- a/templates/_user_list_torrents.html +++ b/templates/_user_list_torrents.html @@ -1,5 +1,6 @@ {{define "profile_content"}} {{with .UserProfile}} +{{ if gt (len .ListTorrents) 0 }}
    @@ -44,5 +45,8 @@ + {{else}} +

    {{ T "no_torrents_uploaded" }}

    +{{end}} {{end}} {{end}} diff --git a/translations/en-us.all.json b/translations/en-us.all.json index 0a0bd08a..ee7a72fc 100644 --- a/translations/en-us.all.json +++ b/translations/en-us.all.json @@ -179,6 +179,10 @@ "id": "404_not_found", "translation": "404 Not Found" }, + { + "id": "no_torrents_uploaded", + "translation": "No torrents uploaded yet!" + }, { "id": "profile", "translation": "Profile" From c830f8ec71266d4648e946f24481622b9674f807 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Tue, 9 May 2017 04:12:32 +0200 Subject: [PATCH 07/13] Fixed --- router/notFoundHandler.go | 8 -------- router/template.go | 7 ++++++- templates/_user_list_torrents.html | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/router/notFoundHandler.go b/router/notFoundHandler.go index f7a9827a..ed41e902 100644 --- a/router/notFoundHandler.go +++ b/router/notFoundHandler.go @@ -1,20 +1,12 @@ package router import ( - "html/template" "net/http" "github.com/ewhal/nyaa/util/languages" "github.com/gorilla/mux" ) -var notFoundTemplate = template.Must(template.New("NotFound").Funcs(FuncMap).ParseFiles("templates/index.html", "templates/404.html")) - -func init() { - // common - template.Must(notFoundTemplate.ParseGlob("templates/_*.html")) -} - func NotFoundHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNotFound) diff --git a/router/template.go b/router/template.go index 4a26fdb4..6a6148c5 100644 --- a/router/template.go +++ b/router/template.go @@ -7,7 +7,7 @@ import ( var TemplateDir = "templates" -var homeTemplate, searchTemplate, faqTemplate, uploadTemplate, viewTemplate, viewRegisterTemplate, viewLoginTemplate, viewRegisterSuccessTemplate, viewVerifySuccessTemplate, viewProfileTemplate *template.Template +var homeTemplate, searchTemplate, faqTemplate, uploadTemplate, viewTemplate, viewRegisterTemplate, viewLoginTemplate, viewRegisterSuccessTemplate, viewVerifySuccessTemplate, viewProfileTemplate, notFoundTemplate *template.Template type templateLoader struct { templ **template.Template @@ -68,6 +68,11 @@ func ReloadTemplates() { name: "user_profile", file: "user/profile.html", }, + templateLoader{ + templ: ¬FoundTemplate, + name: "404", + file: "404.html", + }, } for _, templ := range templs { t := template.Must(template.New(templ.name).Funcs(FuncMap).ParseFiles(filepath.Join(TemplateDir, "index.html"), filepath.Join(TemplateDir, templ.file))) diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html index d5518975..37d87807 100644 --- a/templates/_user_list_torrents.html +++ b/templates/_user_list_torrents.html @@ -1,6 +1,6 @@ {{define "profile_content"}} {{with .UserProfile}} -{{ if gt (len .ListTorrents) 0 }} +{{ if gt (len .Torrents) 0 }}
    From 0c3f72f9a2b9ec6e463122d16f1ce389dbf61074 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Tue, 9 May 2017 04:23:45 +0200 Subject: [PATCH 08/13] 404 when no user found --- router/userHandler.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/router/userHandler.go b/router/userHandler.go index 2bcf105b..efa73756 100644 --- a/router/userHandler.go +++ b/router/userHandler.go @@ -52,9 +52,9 @@ func UserProfileHandler(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) id := vars["id"] userProfile, _, errorUser := userService.RetrieveUserForAdmin(id) + if (errorUser == nil) { currentUser := GetUser(r) view := r.URL.Query().Get("view") - if (errorUser == nil) { if ((view == "edit")&&(userPermission.CurrentOrAdmin(currentUser, userProfile.Id))) { } else { languages.SetTranslationFromRequest(viewProfileTemplate, r, "en-us") @@ -66,7 +66,14 @@ func UserProfileHandler(w http.ResponseWriter, r *http.Request) { } } } else { - NotFoundHandler(w, r) + searchForm := NewSearchForm() + searchForm.HideAdvancedSearch = true + + languages.SetTranslationFromRequest(notFoundTemplate, r, "en-us") + err := notFoundTemplate.ExecuteTemplate(w, "index.html", NotFoundTemplateVariables{Navigation{}, searchForm, GetUser(r), r.URL, mux.CurrentRoute(r)}) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + } } } From 711dc5fda04cb1bf99cb96f85d03da1ff06e45aa Mon Sep 17 00:00:00 2001 From: ayame-git Date: Tue, 9 May 2017 05:29:26 +0300 Subject: [PATCH 09/13] category and status search not workign --- util/search/search.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/search/search.go b/util/search/search.go index cf89477f..8773de2f 100644 --- a/util/search/search.go +++ b/util/search/search.go @@ -78,18 +78,18 @@ func SearchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, parameters := torrentService.WhereParams{} conditions := []string{} if searchCatId != "" { - conditions = append(conditions, "category_id = ?") + conditions = append(conditions, "category = ?") parameters.Params = append(parameters.Params, searchCatId) } if searchSubCatId != "" { - conditions = append(conditions, "sub_category_id = ?") + conditions = append(conditions, "sub_category = ?") parameters.Params = append(parameters.Params, searchSubCatId) } if search_param.Status != "" { if search_param.Status == "2" { - conditions = append(conditions, "status_id != ?") + conditions = append(conditions, "status != ?") } else { - conditions = append(conditions, "status_id = ?") + conditions = append(conditions, "status = ?") } parameters.Params = append(parameters.Params, search_param.Status) } From 86a2f3f110cf09f53911bf8992ea2df8fca4d057 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Tue, 9 May 2017 04:30:21 +0200 Subject: [PATCH 10/13] Added User Search Functionality --- util/search/search.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/search/search.go b/util/search/search.go index 8773de2f..53712371 100644 --- a/util/search/search.go +++ b/util/search/search.go @@ -37,6 +37,7 @@ func SearchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, search_param.Status = r.URL.Query().Get("s") search_param.Sort = r.URL.Query().Get("sort") search_param.Order = r.URL.Query().Get("order") + userId := r.URL.Query().Get("userId") catsSplit := strings.Split(search_param.Category, "_") // need this to prevent out of index panics @@ -85,6 +86,10 @@ func SearchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, conditions = append(conditions, "sub_category = ?") parameters.Params = append(parameters.Params, searchSubCatId) } + if userId != "" { + conditions = append(conditions, "uploader = ?") + parameters.Params = append(parameters.Params, userId) + } if search_param.Status != "" { if search_param.Status == "2" { conditions = append(conditions, "status != ?") From ecaa9f765aa93d00f14b72e1fb9d67676d09c3b3 Mon Sep 17 00:00:00 2001 From: ayame-git Date: Tue, 9 May 2017 05:44:08 +0300 Subject: [PATCH 11/13] autism --- model/torrent.go | 32 ++++++++++++++++---------------- util/search/search.go | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/model/torrent.go b/model/torrent.go index 21377669..1cc0b7f2 100644 --- a/model/torrent.go +++ b/model/torrent.go @@ -20,23 +20,23 @@ type Feed struct { } type Torrents struct { - Id uint `gorm:"column:torrent_id;primary_key"` - Name string `gorm:"column:torrent_name"` - Hash string `gorm:"column:torrent_hash"` - Category int `gorm:"column:category"` - Sub_Category int `gorm:"column:sub_category"` - Status int `gorm:"column:status"` - Date time.Time `gorm:"column:date"` - UploaderId uint `gorm:"column:uploader"` - Downloads int `gorm:"column:downloads"` - Stardom int `gorm:"column:stardom"` - Filesize int64 `gorm:"column:filesize"` - Description string `gorm:"column:description"` - WebsiteLink string `gorm:"column:website_link"` + Id uint `gorm:"column:torrent_id;primary_key"` + Name string `gorm:"column:torrent_name"` + Hash string `gorm:"column:torrent_hash"` + Category int `gorm:"column:category_od"` + Sub_Category int `gorm:"column:sub_category_id"` + Status int `gorm:"column:status_id"` + Date time.Time `gorm:"column:date"` + UploaderId uint `gorm:"column:uploader"` + Downloads int `gorm:"column:downloads"` + Stardom int `gorm:"column:stardom"` + Filesize int64 `gorm:"column:filesize"` + Description string `gorm:"column:description"` + WebsiteLink string `gorm:"column:website_link"` - Uploader *User `gorm:"ForeignKey:uploader"` - OldComments []OldComment `gorm:"ForeignKey:torrent_id"` - Comments []Comment `gorm:"ForeignKey:torrent_id"` + Uploader *User `gorm:"ForeignKey:uploader"` + OldComments []OldComment `gorm:"ForeignKey:torrent_id"` + Comments []Comment `gorm:"ForeignKey:torrent_id"` } /* We need JSON Object instead because of Magnet URL that is not in the database but generated dynamically */ diff --git a/util/search/search.go b/util/search/search.go index 53712371..6daa3f05 100644 --- a/util/search/search.go +++ b/util/search/search.go @@ -79,11 +79,11 @@ func SearchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, parameters := torrentService.WhereParams{} conditions := []string{} if searchCatId != "" { - conditions = append(conditions, "category = ?") + conditions = append(conditions, "category_id = ?") parameters.Params = append(parameters.Params, searchCatId) } if searchSubCatId != "" { - conditions = append(conditions, "sub_category = ?") + conditions = append(conditions, "sub_category_id = ?") parameters.Params = append(parameters.Params, searchSubCatId) } if userId != "" { @@ -92,9 +92,9 @@ func SearchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, } if search_param.Status != "" { if search_param.Status == "2" { - conditions = append(conditions, "status != ?") + conditions = append(conditions, "status_id != ?") } else { - conditions = append(conditions, "status = ?") + conditions = append(conditions, "status_id = ?") } parameters.Params = append(parameters.Params, search_param.Status) } From 0753899cc743ee2687ce64f1b42d2428fb84c415 Mon Sep 17 00:00:00 2001 From: ayame-git Date: Tue, 9 May 2017 05:45:25 +0300 Subject: [PATCH 12/13] autism 2 electric boogaloo --- model/torrent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/torrent.go b/model/torrent.go index 1cc0b7f2..0cd1f1cc 100644 --- a/model/torrent.go +++ b/model/torrent.go @@ -23,7 +23,7 @@ type Torrents struct { Id uint `gorm:"column:torrent_id;primary_key"` Name string `gorm:"column:torrent_name"` Hash string `gorm:"column:torrent_hash"` - Category int `gorm:"column:category_od"` + Category int `gorm:"column:category_id"` Sub_Category int `gorm:"column:sub_category_id"` Status int `gorm:"column:status_id"` Date time.Time `gorm:"column:date"` From 10fddc9130c03f7c3b38e4bdb789ea8cbfe56e64 Mon Sep 17 00:00:00 2001 From: PantsuDev Date: Tue, 9 May 2017 13:13:15 +1000 Subject: [PATCH 13/13] Update README.md --- README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 977ee05b..1ad6742b 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,7 @@ Access the website by going to [localhost:9999](http://localhost:9999). > nyaa_psql.backup. ## TODO -* postgres + gin indexes for fulltext search - * Remove LIKE AND OFFSET queries - * optimize queries in general +## High priority * Torrent data scraping from definable tracker (We have a tracker that the owner is ok for us to scrape from) * seeds/leeachers * file lists @@ -70,11 +68,15 @@ Access the website by going to [localhost:9999](http://localhost:9999). * Accounts and Registration System(WIP) * Report Feature and Moderation System * blocking upload of torrent hashes -* fix sukebei categories -* Site theme - * original nyaa theme -* API improvement -* Scraping of fan subbing RSS feeds + +## Lower priority + * Get code up to standard of go lint recommendations + * Write tests + * fix sukebei categories + * Site theme + * original nyaa theme + * API improvement + * Scraping of fan subbing RSS feeds * Daily DB dumps