Revert "get nickname from seahub database (#663)" (#668)

This reverts commit d51591d8f7.

fileserver/merge.go

@@ -12,11 +12,10 @@ import (
 )
 
 type mergeOptions struct {
-	remoteRepoID    string
-	remoteHead      string
-	mergedRoot      string
-	conflict        bool
-	emailToNickname map[string]string
+	remoteRepoID string
+	remoteHead   string
+	mergedRoot   string
+	conflict     bool
 }
 
 func mergeTrees(storeID string, roots []string, opt *mergeOptions) error {
@@ -25,8 +24,6 @@ func mergeTrees(storeID string, roots []string, opt *mergeOptions) error {
 		return err
 	}
 
-	opt.emailToNickname = make(map[string]string)
-
 	var trees []*fsmgr.SeafDir
 	for i := 0; i < 3; i++ {
 		dir, err := fsmgr.GetSeafdir(storeID, roots[i])
@@ -338,9 +335,7 @@ func mergeConflictFileName(storeID string, opt *mergeOptions, baseDir, fileName
 		mtime = time.Now().Unix()
 	}
 
-	nickname := getNickNameByModifier(opt.emailToNickname, modifier)
-
-	conflictName := genConflictPath(fileName, nickname, mtime)
+	conflictName := genConflictPath(fileName, modifier, mtime)
 
 	return conflictName, nil
 }
@@ -371,29 +366,6 @@ func genConflictPath(originPath, modifier string, mtime int64) string {
 	return conflictPath
 }
 
-func getNickNameByModifier(emailToNickname map[string]string, modifier string) string {
-	if modifier == "" {
-		return ""
-	}
-	nickname, ok := emailToNickname[modifier]
-	if ok {
-		return nickname
-	}
-	if seahubDB != nil {
-		sqlStr := "SELECT nickname from profile_profile WHERE user = ?"
-		row := seahubDB.QueryRow(sqlStr, modifier)
-		row.Scan(&nickname)
-	}
-
-	if nickname == "" {
-		nickname = modifier
-	}
-
-	emailToNickname[modifier] = nickname
-
-	return nickname
-}
-
 func getFileModifierMtime(repoID, storeID, head, filePath string) (string, int64, error) {
 	commit, err := commitmgr.Load(repoID, head)
 	if err != nil {