appview: use explicit `TANGLED_PDS_USER_DOMAIN` for user handle check

PDS might have different domain for PDS hostname & user handles

Signed-off-by: Seongmin Lee <[e-mail]>

appview/config/config.go

···
 
 type PdsConfig struct {
 	Host        string `env:"HOST, default=https://tngl.sh"`
+	UserDomain  string `env:"USER_DOMAIN, default=.tngl.sh"`
 	AdminSecret string `env:"ADMIN_SECRET"`
 }
 

appview/pages/funcmap.go

···
 					{"Name": "hooks", "Icon": "webhook"},
 					{"Name": "sites", "Icon": "globe"},
 				},
+				"PdsUserDomain": p.pdsCfg.UserDomain,
 			}
 		},
 	}

appview/pages/pages.go

···
 	cache *TmplCache[string, *template.Template]
 
 	avatar      config.AvatarConfig
+	pdsCfg      config.PdsConfig
 	resolver    *idresolver.Resolver
 	db          *db.DB
 	dev         bool
···
 		cache:       NewTmplCache[string, *template.Template](),
 		dev:         config.Core.Dev,
 		avatar:      config.Avatar,
+		pdsCfg:      config.Pds,
 		rctx:        rctx,
 		resolver:    res,
 		db:          database,
···
 	PunchcardPreference models.PunchcardPreference
 	IsTnglSh            bool
 	IsDeactivated       bool
-	PdsDomain           string
 	HandleOpen          bool
 }
 

appview/pages/templates/user/settings/profile.html

···
             <input type="hidden" name="type" value="subdomain">
             <div class="flex items-stretch rounded border border-gray-200 dark:border-gray-600 overflow-hidden focus-within:ring-1 focus-within:ring-blue-500 dark:bg-gray-700">
               <input type="text" name="handle" placeholder="username" class="flex-1 px-2 py-1.5 bg-transparent dark:text-white border-0 focus:outline-none focus:ring-0 min-w-0" required>
-              <span class="px-2 py-1.5 bg-gray-100 dark:bg-gray-600 text-gray-500 dark:text-gray-300 select-none whitespace-nowrap border-l border-gray-200 dark:border-gray-600 content-center">.{{ .PdsDomain }}</span>
+              <span class="px-2 py-1.5 bg-gray-100 dark:bg-gray-600 text-gray-500 dark:text-gray-300 select-none whitespace-nowrap border-l border-gray-200 dark:border-gray-600 content-center">{{ const.PdsUserDomain }}</span>
             </div>
             <div class="flex gap-2 pt-2">
               <button type="button" popovertarget="change-handle-modal" popovertargetaction="hide" class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300">
···
               </button>
             </div>
           </form>
-          <a href="#" id="switch-to-subdomain" class="text-sm text-gray-400 underline hover:text-gray-600 dark:hover:text-gray-300">use a {{ .PdsDomain }} subdomain instead</a>
+          <a href="#" id="switch-to-subdomain" class="text-sm text-gray-400 underline hover:text-gray-600 dark:hover:text-gray-300">use a {{ const.PdsUserDomain }} subdomain instead</a>
         </div>
         <div id="handle-error" class="text-red-500 dark:text-red-400 text-sm empty:hidden"></div>
         <div id="handle-success" class="text-green-500 dark:text-green-400 text-sm empty:hidden"></div>

appview/settings/settings.go

···
 
 func (s *Settings) sitesSettings(w http.ResponseWriter, r *http.Request) {
 	user := s.OAuth.GetMultiAccountUser(r)
-	did := s.OAuth.GetDid(r)
 
-	claim, err := db.GetActiveDomainClaimForDid(s.Db, did)
+	claim, err := db.GetActiveDomainClaimForDid(s.Db, user.Active.Did)
 	if err != nil {
 		s.Logger.Error("failed to get domain claim", "err", err)
 		claim = nil
···
 
 	// determine whether the active account has a tngl.sh handle, in which
 	// case their sites domain is automatically their handle domain.
-	pdsDomain := strings.TrimPrefix(s.Config.Pds.Host, "https://")
-	pdsDomain = strings.TrimPrefix(pdsDomain, "http://")
 	isTnglHandle := false
 	for _, acc := range user.Accounts {
-		if acc.Did == did && strings.HasSuffix(acc.Handle, "."+pdsDomain) {
-			isTnglHandle = true
+		if acc.Did == user.Active.Did {
+			isTnglHandle = strings.HasSuffix(acc.Handle, s.Config.Pds.UserDomain)
 			break
 		}
 	}
···
 }
 
 func (s *Settings) releaseSitesDomain(w http.ResponseWriter, r *http.Request) {
-	did := s.OAuth.GetDid(r)
+	user := s.OAuth.GetMultiAccountUser(r)
 	domain := strings.TrimSpace(r.FormValue("domain"))
 
 	if domain == "" {
···
 		return
 	}
 
-	pdsDomain := strings.TrimPrefix(s.Config.Pds.Host, "https://")
-	pdsDomain = strings.TrimPrefix(pdsDomain, "http://")
-	user := s.OAuth.GetMultiAccountUser(r)
 	for _, acc := range user.Accounts {
-		if acc.Did == did && strings.HasSuffix(acc.Handle, "."+pdsDomain) {
-			if strings.HasSuffix(domain, "."+pdsDomain) {
+		if acc.Did == user.Active.Did {
+			if strings.HasSuffix(acc.Handle, s.Config.Pds.UserDomain) {
 				s.Pages.Notice(w, "settings-sites-error", "Your tngl.sh domain is tied to your handle and cannot be released here.")
 				return
 			}
+			break
 		}
 	}
 
-	if err := db.ReleaseDomain(s.Db, did, domain); err != nil {
+	if err := db.ReleaseDomain(s.Db, user.Active.Did, domain); err != nil {
 		s.Logger.Error("releasing domain", "err", err)
 		s.Pages.Notice(w, "settings-sites-error", "Unable to release domain. Make sure it belongs to your account.")
 		return
···
 
 	// Clean up all site data for this DID asynchronously.
 	if s.CfClient.Enabled() {
-		siteConfigs, err := db.GetRepoSiteConfigsForDid(s.Db, did)
+		siteConfigs, err := db.GetRepoSiteConfigsForDid(s.Db, user.Active.Did)
 		if err != nil {
 			s.Logger.Error("releaseSitesDomain: fetching site configs for cleanup", "err", err)
 		}
 
-		if err := db.DeleteRepoSiteConfigsForDid(s.Db, did); err != nil {
+		if err := db.DeleteRepoSiteConfigsForDid(s.Db, user.Active.Did); err != nil {
 			s.Logger.Error("releaseSitesDomain: deleting site configs from db", "err", err)
 		}
 
···
 
 			// Delete each repo's R2 objects.
 			for _, sc := range siteConfigs {
-				if err := sites.Delete(ctx, s.CfClient, did, sc.RepoName); err != nil {
-					s.Logger.Error("releaseSitesDomain: R2 delete failed", "did", did, "repo", sc.RepoName, "err", err)
+				if err := sites.Delete(ctx, s.CfClient, user.Active.Did, sc.RepoName); err != nil {
+					s.Logger.Error("releaseSitesDomain: R2 delete failed", "did", user.Active.Did, "repo", sc.RepoName, "err", err)
 				}
 			}
 
···
 		PunchcardPreference: punchcardPreferences,
 		IsTnglSh:            s.Config.Pds.IsTnglShUser(user.Pds()),
 		IsDeactivated:       isDeactivated,
-		PdsDomain:           s.pdsDomain(),
 		HandleOpen:          r.URL.Query().Get("handle") == "1",
 	})
 }
···
 	}
 }
 
-func (s *Settings) pdsDomain() string {
-	parsed, err := url.Parse(s.Config.Pds.Host)
-	if err != nil {
-		return s.Config.Pds.Host
-	}
-	return parsed.Hostname()
-}
-
 func (s *Settings) elevateForHandle(w http.ResponseWriter, r *http.Request) {
 	user := s.OAuth.GetMultiAccountUser(r)
 	if !s.Config.Pds.IsTnglShUser(user.Pds()) {
···
 			s.Pages.Notice(w, "handle-error", "Invalid handle. Use only lowercase letters, digits, and hyphens.")
 			return
 		}
-		newHandle = handleInput + "." + s.pdsDomain()
+		newHandle = handleInput + s.Config.Pds.UserDomain
 	case "custom":
 		newHandle = handleInput
 	default: