removed unnecessary nil checks

TUM-Dev · Oct 16, 2024 · fc14c03 · fc14c03
1 parent 346ce71
commit fc14c03
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git a/model/semester.go b/model/semester.go
@@ -7,9 +7,6 @@ type Semester struct {
 
 // InRangeOfSemesters checks if s is between firstSemester (inclusive) and lastSemester (inclusive) or is element of semesters slice
 func (s *Semester) InRangeOfSemesters(firstSemester Semester, lastSemester Semester, semesters []Semester) bool {
-	if s == nil {
-		return false
-	}
 	if semesters == nil {
 		if firstSemester.Year == lastSemester.Year && firstSemester.TeachingTerm == lastSemester.TeachingTerm {
 			return s.Year == firstSemester.Year && s.TeachingTerm == firstSemester.TeachingTerm
@@ -26,8 +23,5 @@ func (s *Semester) InRangeOfSemesters(firstSemester Semester, lastSemester Semes
 
 // GreaterEqualThan checks if s comes after or is equal to s1
 func (s *Semester) GreaterEqualThan(s1 Semester) bool {
-	if s == nil {
-		return false
-	}
 	return s.Year > s1.Year || (s.Year == s1.Year && (s.TeachingTerm == "W" || s1.TeachingTerm == "S"))
 }
diff --git a/model/user.go b/model/user.go
@@ -72,9 +72,6 @@ type UserSetting struct {
 
 // GetPreferredName returns the preferred name of the user if set, otherwise the firstName from TUMOnline
 func (u *User) GetPreferredName() string {
-	if u == nil {
-		return "Empty Name"
-	}
 	for _, setting := range u.Settings {
 		if setting.Type == PreferredName {
 			return setting.Value
@@ -162,9 +159,6 @@ func (u *User) GetCustomSpeeds() (speeds CustomSpeeds) {
 
 // GetPreferredGreeting returns the preferred greeting of the user if set, otherwise Moin
 func (u *User) GetPreferredGreeting() string {
-	if u == nil {
-		return "Moin"
-	}
 	for _, setting := range u.Settings {
 		if setting.Type == Greeting {
 			return setting.Value
@@ -197,9 +191,6 @@ func (u *User) GetSeekingTime() int {
 
 // PreferredNameChangeAllowed returns false if the user has set a preferred name within the last 3 months, otherwise true
 func (u *User) PreferredNameChangeAllowed() bool {
-	if u == nil {
-		return false
-	}
 	for _, setting := range u.Settings {
 		if setting.Type == PreferredName && time.Since(setting.UpdatedAt) < time.Hour*24*30*3 {
 			return false
@@ -215,9 +206,6 @@ type AutoSkipSetting struct {
 
 // GetAutoSkipEnabled returns whether the user has enabled auto skip
 func (u *User) GetAutoSkipEnabled() (AutoSkipSetting, error) {
-	if u == nil {
-		return AutoSkipSetting{Enabled: false}, nil
-	}
 	for _, setting := range u.Settings {
 		if setting.Type == AutoSkip {
 			var a AutoSkipSetting
@@ -316,9 +304,6 @@ func (u *User) CoursesForSemester(year int, term string, context context.Context
 
 // AdministeredCoursesForSemesters returns all courses, that the user is a course admin of, in the given semester range or semesters
 func (u *User) AdministeredCoursesForSemesters(firstSemester Semester, lastSemester Semester, semesters []Semester) []Course {
-	if u == nil {
-		return make([]Course, 0)
-	}
 	var semester Semester
 	administeredCourses := make([]Course, 0)
 	for _, c := range u.AdministeredCourses {
@@ -332,9 +317,6 @@ func (u *User) AdministeredCoursesForSemesters(firstSemester Semester, lastSemes
 
 // CoursesForSemestersWithoutAdministeredCourses returns all courses of the user in the given semester range or semesters excluding administered courses
 func (u *User) CoursesForSemestersWithoutAdministeredCourses(firstSemester Semester, lastSemester Semester, semesters []Semester) []Course {
-	if u == nil {
-		return make([]Course, 0)
-	}
 	var semester Semester
 	courses := make([]Course, 0)
 	for _, c := range u.Courses {