Albirew/nyaa-pantsu
Archivé
1
0
Bifurcation 0

Fixed pointer dereference

Limiting number of languages to 1 in listing view
Cette révision appartient à :
akuma06 2017-07-03 00:59:59 +02:00
Parent b10d5e32b5
révision a02976ef57
3 fichiers modifiés avec 7 ajouts et 7 suppressions

Voir le fichier

@ -54,8 +54,8 @@
<div class="nyaa-cat nyaa-cat-{{ .SubCategory}}">
{{end}}
<a href="{{ URL.Parse("/search?c="+.Category+"_"+ .SubCategory) }}" title="{{ T(CategoryName(.Category, .SubCategory)) }}">
{{if FlagCode(.Language) != ""}}
<img src="img/blank.gif" alt="{{ LanguageName(.Language, T) }}" class="flag flag-{{FlagCode(.Language)}}" title="{{ LanguageName(.Language, T) }}">
{{if len(.Languages) == 1 }}
<img src="img/blank.gif" alt="{{ LanguageName(.Languages[0], T) }}" class="flag flag-{{FlagCode(.Language[0])}}" title="{{ LanguageName(.Language[0], T) }}">
{{end}}
</a>
</div>

Voir le fichier

@ -34,9 +34,9 @@ func NewCurrentUserRetriever() *CurrentUserRetriever {
type CurrentUserRetriever struct{}
// RetrieveCurrentUser retrieve current user for languages
func (*CurrentUserRetriever) RetrieveCurrentUser(c *gin.Context) (models.User, error) {
func (*CurrentUserRetriever) RetrieveCurrentUser(c *gin.Context) (*models.User, error) {
user, _, err := CurrentUser(c)
return *user, err
return user, err
}
// CreateUserAuthentication creates user authentication.

Voir le fichier

@ -16,7 +16,7 @@ import (
// UserRetriever : this interface is required to prevent a cyclic import between the languages and userService package.
type UserRetriever interface {
RetrieveCurrentUser(c *gin.Context) (models.User, error)
RetrieveCurrentUser(c *gin.Context) (*models.User, error)
}
// TemplateTfunc : T func used in template
@ -175,9 +175,9 @@ func GetMascotUrlFromRequest(c *gin.Context) string {
return ""
}
func getCurrentUser(c *gin.Context) (models.User, error) {
func getCurrentUser(c *gin.Context) (*models.User, error) {
if userRetriever == nil {
return models.User{}, errors.New("failed to get current user: no user retriever set")
return &models.User{}, errors.New("failed to get current user: no user retriever set")
}
return userRetriever.RetrieveCurrentUser(c)
}